Shawn Rutledge [Thu, 28 Feb 2013 16:57:38 +0000 (17:57 +0100)]
Create common base class for declarative dialogs
QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can
the future platform dialog types. Also some header comment corrections.
Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47
Reviewed-by: Liang Qi <liang.qi@digia.com>
Shawn Rutledge [Thu, 14 Mar 2013 20:06:51 +0000 (21:06 +0100)]
photosurface example: simplify PinchArea usage; fileUrls; license
FileDialog.filePaths was changed to fileUrls. No need to do so much
scripting because the PinchArea.target takes care of the math already,
and with better rotational symmetry too. Example QML should have a
BSD license.
Change-Id: I892292574c81c032d948c1c2d4924fc7127dd008
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
J-P Nurmi [Fri, 1 Mar 2013 14:26:54 +0000 (15:26 +0100)]
Add TextEdit::selectByKeyboard
The main use case is for enabling text selection by keyboard
for read-only editors.
Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
J-P Nurmi [Wed, 27 Feb 2013 12:54:26 +0000 (13:54 +0100)]
QQuickWindow: expose activeFocusItem as a property
Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Debao Zhang [Thu, 7 Mar 2013 09:23:30 +0000 (17:23 +0800)]
QQuickView's equivalent in QtQuick1 is QDeclarativeView
Change-Id: I12104e8bd58a406a0ff03c110e2df54bbc1c816c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Alan Alpert [Wed, 23 Jan 2013 23:17:27 +0000 (15:17 -0800)]
Move QML types to types folder
The QtQml module has gain a bunch of QML types cluttering up the qml
folder. Moving them to types organizes them a bit better.
Change-Id: I570884c00f4abc48f4f1aea048bf002bc70223f3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Shawn Rutledge [Fri, 8 Mar 2013 15:44:32 +0000 (16:44 +0100)]
Cosmetic changes in common controls for examples
Use system palette colors. SimpleLauncherDelegate has its own "button"
rather than using the shared one, which really wasn't suitable for any other
purpose. So now example apps can use Button, and ToolButton isn't necessary.
Change-Id: I632397f36b96a26c32a86301ddacb85d5c3221f0
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Frederik Gladhorn [Mon, 4 Mar 2013 20:45:24 +0000 (21:45 +0100)]
Add some docs, improve scope of var.
Change-Id: I62e0b3bb4882f58ba58b3c8d71679e4ad2dbc5a3
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Frederik Gladhorn [Thu, 14 Mar 2013 08:30:12 +0000 (09:30 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Samuel Rødal [Wed, 13 Mar 2013 15:10:06 +0000 (16:10 +0100)]
Compile fix.
Some compilers don't allow the first argument to printf and similar
functions to be a non-literal string.
Change-Id: Idd11ae6679d5c0585b5d10b76c991dcfdb4f65da
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Jędrzej Nowacki [Tue, 12 Mar 2013 10:03:51 +0000 (11:03 +0100)]
Polish usage of a QElapsedTime instance in QSGThreadedRenderLoop
The patch should make valgrind happy, by not using an uninitialized
memory.
Change-Id: Iec7f16c56f250dd121a37f03da4cfc5d9e5c0742
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Libor Tomsik [Thu, 7 Mar 2013 07:37:08 +0000 (08:37 +0100)]
Fixed tutorial gettingStartedQml part5.
In FileDialog.qml the selector GridView.view.currentIndex does not work, replaced with dirView.currentIndex
Change-Id: I7c1893ce3872c41fc4f0fd63bad0e6a2cff2b207
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Thomas McGuire [Wed, 13 Mar 2013 09:43:51 +0000 (10:43 +0100)]
Fix usages of \since for QML items
\since uses the QML import, not the Qt version.
When adding a new property, it needs a REVISION argument and the type
needs to be registered again for the new version.
Change-Id: I2e636e9d26c8e989729eadad2ef73a836c35caa1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Stephen Kelly [Wed, 13 Mar 2013 14:47:29 +0000 (15:47 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Shawn Rutledge [Tue, 5 Mar 2013 08:26:45 +0000 (09:26 +0100)]
Documentation and versioning for new Window properties
Even some of the properties that existed in 5.0 were not documented.
Change-Id: I25a14b9b19425a6c792d06bc41983e9abd1d17d0
Task-number: QTBUG-29807
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Jerome Pasion [Wed, 13 Mar 2013 09:57:11 +0000 (10:57 +0100)]
Doc: Changed section title in whatsnew.qdoc
- "Qt 5.0" is the name of the main landing page, which causes link
conflicts in Qt QML module.
Change-Id: I2becb864873ea3784eb4fece3ebcbe64e0a00cba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Gunnar Sletta [Wed, 13 Mar 2013 06:36:30 +0000 (07:36 +0100)]
Abort rendering when QOpenGLContext::create/makeCurrent fails.
Task-number: QTBUG-30158
Change-Id: Ic8239fe6f074c989e4474d46042e1a82796b4908
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Oswald Buddenhagen [Tue, 12 Mar 2013 19:26:13 +0000 (20:26 +0100)]
don't use CamelCase includes
they are not available during bootstrap.
Change-Id: I5e941f22cd2b9fa622730ba0bf8389394f6a30a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Thomas Kristensen [Mon, 11 Mar 2013 11:54:56 +0000 (12:54 +0100)]
Makes QSmoothedAnimation respect zero duration.
In automated GUI test scenarios it often desired not to wait for animations
before verifying a result, so setting the duration to zero should accomplish
this, before this patch; if duration was set to zero QSmoothedAnimation
would treat it as if duration was not set, and used velocity to calculate
animation speed.
Change-Id: Ia57f1c9ffdd2056ac7c85d1cb94dbd3835fcbb7a
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Alan Alpert [Wed, 23 Jan 2013 22:08:58 +0000 (14:08 -0800)]
Add QtQml.Models module
The moved Model classes can now be exposed in a QtQml import.
To keep the QtQml import resticted to more core functionality, they are
being exposed in a plugin module.
Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Alan Alpert [Tue, 26 Feb 2013 21:50:51 +0000 (13:50 -0800)]
Fix remote image loading for AnimatedSprite
The Sprite generated behind the scenes had no QmlEngine associated, and
the engine is needed by QQuickPixmap for async loading.
Task-number: QTBUG-28086
Change-Id: Ibf3b03c54b339fe8f44201dc6fcb507e5274bbec
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Bernd Weimer [Thu, 7 Mar 2013 15:07:35 +0000 (16:07 +0100)]
Fixed some auto tests
In the listmodel test an error description was not converted to a
string.
In the pathview test, number literals are always interpreted as double,
but qreal can also be float, which lead to failing tests. Constructor
usage prevents "expected data of type 'float', got 'double'".
Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Yoann Lopes [Tue, 12 Mar 2013 11:57:39 +0000 (12:57 +0100)]
Fixed text opacity when using Text.NativeRendering.
Change-Id: I76922074c02c368f8a8a6998c478a33537e9a6e8
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Friedemann Kleint [Thu, 7 Mar 2013 14:47:27 +0000 (15:47 +0100)]
Fix QString usage in createPixmapDataSync().
Warning introduced by
707bbe5dea9d7398b205124a54422f2fafb6f151 .
Change-Id: I20f0da00ea519cc2ec82a1d13f1887c099a3947c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Frederik Gladhorn [Tue, 12 Mar 2013 12:38:11 +0000 (13:38 +0100)]
Disable accessibility temporarily.
This is required to update headers in QtBase.
Change-Id: I373a1f13dcde8ce1cafeedb5cd2269a0f8f3a670
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Yoann Lopes [Fri, 8 Mar 2013 13:28:21 +0000 (14:28 +0100)]
Fixed incorrect vsync delta time in QSGThreadedRenderLoop.
Change-Id: I32bb720e9c9aa0278959dd64e5e1c449bdace7d1
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Frederik Gladhorn [Tue, 12 Mar 2013 10:30:13 +0000 (11:30 +0100)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9f54f308efc4d165d091f215d0b031e4e895d749
Michael Brasser [Tue, 5 Mar 2013 02:20:15 +0000 (20:20 -0600)]
Introduce QML_FBO_FLUSH_BEFORE_DETACH to work around FBO issue.
On some AMD hardware, detaching the depth attachment immediately after
rendering to an FBO will cause rendering issues. Adding an explicit
glFlush before detaching seems to work around the issue.
Task-number: QTBUG-29265
Change-Id: I97c7b87c1c3d3a69a4d6228dd9459745710c5f4c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Peter Varga [Fri, 1 Mar 2013 13:39:59 +0000 (14:39 +0100)]
Use official V8 string manipulation methods in QML
The QtJSBackend's String::GetCharacter and String::Equals methods are Qt
specific and they are not supported by official V8. These methods can be
replaced by more "V8-friendly" implementations in QtDeclarative. Thus
the mentioned methods can be removed from QtJSBackend to reduce the
difference between QtJSBackend and the official V8 source.
Change-Id: I5590ca62dc667e64a7f54a7e47a02d350ba0c077
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Shawn Rutledge [Mon, 11 Mar 2013 10:05:44 +0000 (11:05 +0100)]
correct misspelling
Canceled
Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Gunnar Sletta [Fri, 8 Mar 2013 18:45:07 +0000 (19:45 +0100)]
Create the sg render thread's opengl context on the GUI thread
Change-Id: I710d80ebb4e5a12fda1f58f54089b0e72268dfcf
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Xingtao Zhang [Fri, 8 Mar 2013 19:44:40 +0000 (19:44 +0000)]
make the sample code more consistent in context
Change-Id: Id831032a937bf07b70515e95ff481ea8a741edeb
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Liang Qi [Fri, 22 Feb 2013 12:44:06 +0000 (13:44 +0100)]
Support activeFocusOnTab in QQuickItem
Add activeFocusOnTab as property to QQuickItem. Setting the
property allows automatic keyboard navigation between all
elements that have it set.
This key event handler will only be called after the QML key
handlers, such as KeyNavigation and Keys, and the C++ key
event handlers, such as keyPressEvent function.
Algorithm is most done by Frederik Gladhorn, in cooperation with
Gabriel de Dietrich.
Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com>
Done-with: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Change-Id: I8b58be9c20d113661fe85d27bdb1af84340d9de5
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Andrew den Exter [Tue, 5 Mar 2013 07:56:21 +0000 (17:56 +1000)]
Improve the ordering of Flickable dragging and moving property updates.
Move the contentItem after the dragging and moving properties have been
updated so they return the correct values from the onContentYChanged
and onContentXChanged handlers.
Task-number: QTBUG-30032
Change-Id: I15716dc8eee4d9836f96362a8b49f1d0c404b0c2
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Guenter Schwann [Wed, 27 Feb 2013 14:52:03 +0000 (15:52 +0100)]
Fix displacement transition bug for horizontal case
Task-number: QTBUG-29944
Change-Id: I23381f7a1d2c8d3c6df007b5b11c12b0db3bb1e9
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Peter Varga [Mon, 4 Mar 2013 16:21:08 +0000 (17:21 +0100)]
Replace deprecated V8 functions
The External::Wrap and External::Unwrap functions became deprecated in
the mainline V8. Replace them as it is officially proposed.
Change-Id: Ieac1da53997da440a909939d86c98f17a124c068
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Frederik Gladhorn [Wed, 6 Mar 2013 17:47:17 +0000 (18:47 +0100)]
Improve timer dependent tests.
tst_QQuickLoader::loadedSignal depended on
sharing the engine with simultaneousSyncAsync
and that function being run before it.
After each test run call clearComponentCache()
as that is important for caching of the network tests.
The test server would send the item after 500ms.
Sometimes the CI would be faster or slower.
Instead of relying on timing, simply call a function
when the reply should be sent.
Change-Id: Ifb0447041197e1cba103570597a62a2510d31aab
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Gunnar Sletta [Thu, 7 Mar 2013 07:23:07 +0000 (08:23 +0100)]
Remove comment about performance in qquickitem's clip property.
Change-Id: I2d1b9a86251466445d506969d779308e2d7b92bb
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Thu, 28 Feb 2013 11:28:16 +0000 (12:28 +0100)]
Mark geometry dirty to signal scene graph that a repaint is needed.
Change-Id: Ic230ffe43b690e3f1e0e7290c4c9571f60bd34b7
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Friedemann Kleint [Thu, 7 Mar 2013 10:59:37 +0000 (11:59 +0100)]
Fix warning about uninitialized value in QML-ECMA-test (CLANG).
Change-Id: Ifcc3ef0e0e65245758697d7302e8227bb6e748f7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Friedemann Kleint [Thu, 7 Mar 2013 10:58:41 +0000 (11:58 +0100)]
Fix warning about use of uninitialized value in QML-debug helpers.
Change-Id: Ifcba9c1224dfa7db069ef71b1bb39e3c7658a7b5
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Debao Zhang [Wed, 6 Mar 2013 08:57:44 +0000 (16:57 +0800)]
Fix MSVC warning C4819 under Chinese locale
warning C4819: The file contains a character that cannot be represented in
the current code page (936)
Change-Id: I53dc345e03b0ec6f951bd2763bc1bab4aef63d04
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Thu, 7 Mar 2013 10:58:15 +0000 (11:58 +0100)]
Fix warning about adding int to a QString (CLANG).
Change-Id: Ibc84dcbe5ca4519bb1ac25e5d5463ef58c48190e
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Friedemann Kleint [Thu, 7 Mar 2013 11:08:48 +0000 (12:08 +0100)]
Fix warnings about overloaded virtual functions in tests (CLANG).
Change-Id: I1f4bda77d0520766813201726f53b439b6094a24
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Frederik Gladhorn [Wed, 6 Mar 2013 17:24:19 +0000 (18:24 +0100)]
Simplify function with early return.
Change-Id: Ic0e1a32f6c586e75fb7389ef8009e56881942cf1
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Caroline Chao [Tue, 5 Mar 2013 13:56:10 +0000 (14:56 +0100)]
Tests: add autotests for TextEdit and TextInput
Check the selection is not cleared when the control receives
a focus out event with one of the following reason:
- Qt::ActiveWindowFocusReason
- Qt::PopupFocusReason
Change-Id: I38f4a4cba5e769f19de4e327d03be57a8d1d36a7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Frederik Gladhorn [Mon, 4 Mar 2013 20:26:13 +0000 (21:26 +0100)]
Handle focus events directly in TextEdit.
Instead of relying on the item change
where we don't get focus reason, use
focusInEvent and focusOutEvent.
Change-Id: I2db7d81c67c65595b929fdcedc568af360831c5c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Caroline Chao [Tue, 5 Mar 2013 10:11:02 +0000 (11:11 +0100)]
TextInput: Update text deselection on focus out event
The text selection should not be cleared when the focus
out event received has one the following reasons:
- Qt::ActiveWindowFocusReason
- Qt::PopupFocusReason
When the user opens a menu or navigates to another window,
the eventual selection should not be clearer.
This also makes the behavior consistent with TextEdit.
Change-Id: Ibc6242cb2f8207cf5281925c8e20b88394f21eea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Caroline Chao [Tue, 5 Mar 2013 10:04:26 +0000 (11:04 +0100)]
TextInput: Handle focus event directly
Use focusInEvent and focusOutEvent instead of changeItem
to handle focus event. (One benefit is the focus events
have the focus reason and changeItem doesn't).
Change-Id: I164820f375f0ffddc529d59565a3e448b84c6042
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Caroline Chao [Tue, 5 Mar 2013 11:00:19 +0000 (12:00 +0100)]
Focus reason
When trying to do for example text handling it becomes
obvious that focus handling is not proper.
A mouse click focus should de-select text,
while a window change should preserve the selection.
Re-introduce focus reason.
Change-Id: I3322c976437cba68938d7c9188e549bdb499fa5a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 5 Mar 2013 13:21:04 +0000 (14:21 +0100)]
Fix rendering of subpixel positioned native text
To get accurate sampling of the native text rendering, we use
nearest filtering. This, however, does not work well when we're
sampling in the middle of pixels and the result is that with
text which is positioned at 0.5 offsets, we will sample the
wrong pixels and get artifacts from this. The main use case
for native rendered text is unrotated and unscaled text,
so we fix this use case by pixel-aligning the translation
factor.
Done-with: Samuel
Task-number: QTBUG-30022
Change-Id: I6911196d6ff491dca3b329c42da1c6dd7263cff0
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Gunnar Sletta [Wed, 6 Mar 2013 10:12:44 +0000 (11:12 +0100)]
Disable qv8profilerservice test. It is very unstable
Change-Id: Ic7fada8ca457b15fb62a47d2137de7d6f8b1711a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Gunnar Sletta [Thu, 7 Mar 2013 07:49:36 +0000 (08:49 +0100)]
Disable more unstable tests
Change-Id: I54db72466ca50d65dd39e9c8e25d3a366cb737ea
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Alan Alpert [Mon, 25 Feb 2013 22:38:07 +0000 (14:38 -0800)]
Remove spurious include
While it's discouraged to use the entire module headers inside Qt, this
particular example also compiles without the line.
Change-Id: I75b6fc09e11d00df2f19f5db9b0209ed4cd82844
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Alan Alpert [Tue, 19 Feb 2013 05:07:15 +0000 (21:07 -0800)]
Add core application functionality to Qt.application in QML
This exposes some information to QML which is available on
the QCoreApplication instance.
A future change should make it possible to restrict this for use in scripting
environments (which should not have access to the QCoreApplication). That has
been left out of this change because proper support for such restrictions is
not yet in place.
Change-Id: Ica144fcfb0b42fa6df8d0cb1c7c03eb97282b489
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Paul Olav Tvete [Mon, 4 Mar 2013 12:51:32 +0000 (13:51 +0100)]
Android support: build fixes
Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Frederik Gladhorn [Wed, 9 Jan 2013 14:51:04 +0000 (15:51 +0100)]
Accessibility: Adapt memory management for Qt 5.1
The model was changed to cache interfaces, so
do not try to delete them.
Change-Id: I5a97a6aca38036803c62d90988bb6d02196f0b84
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Frederik Gladhorn [Mon, 4 Mar 2013 23:23:23 +0000 (00:23 +0100)]
Fix crash for keypress without active focus.
If there was no active focus item
we need to use tryShortcutEvent with
the window as target.
Change-Id: I420925781bbbda79fe2a62a5774230ae77c2cd34
Reviewed-by: Liang Qi <liang.qi@digia.com>
Frederik Gladhorn [Mon, 4 Mar 2013 20:08:12 +0000 (21:08 +0100)]
Remove extra semicolon.
Change-Id: I5830f8dd2c636ad8653506c04f8ea1a9ac000f9a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Morten Johan Sørvig [Tue, 5 Mar 2013 07:55:34 +0000 (08:55 +0100)]
Load "@2x" images on high-dpi "retina" systems.
Check for the existence of a "@2x" file when loading
an image from a local file url. For example,
Image {
source = "foo.png"
}
will load "foo@2x.png" if that file exists.
Change-Id: I37688d035bc9eb412d54be0eb758dd52ebfa5d90
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Alan Alpert [Thu, 28 Feb 2013 17:13:23 +0000 (09:13 -0800)]
Work with synchronous replies from a custom QNetworkAccessManager
Forward port of
e5783b79887299d094 from QtQuick 1.
Task-number: QTBUG-27723
Change-Id: I4332dd72bb9d65167307c1ac5ce24e93b14cff5f
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Alan Alpert [Thu, 28 Feb 2013 18:24:47 +0000 (10:24 -0800)]
Fix relative URL in parallax example
Samegame demo moved a while back, this didn't get updated.
Change-Id: Ib34a09f606528e1e53650bbbd4d19787b1864bcb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Shawn Rutledge [Mon, 25 Jun 2012 18:06:12 +0000 (20:06 +0200)]
Added photosurface example to demo PinchArea/MouseArea together
It seems to be important to put the MouseArea inside the PinchArea
in order to support simultaneous drag/rotate/pinch.
Change-Id: Ic3ec6a131bd2d4c7f8a8560cd9c3015a717fef20
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Mon, 4 Mar 2013 13:01:02 +0000 (14:01 +0100)]
Autotests w CONFIG+=parallel_test don't depend on activation or focus
If the test does requestActivate() or relies on isFocusWindow(),
the test cannot be parallel_test. Also, a lot of the tests don't
actually need the window to be active, only exposed; and waiting
only for exposed is likely to make them more stable.
Change-Id: I0845b9b12ddf7f0c8906d9738a3e26d46ab98820
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Mon, 4 Mar 2013 12:58:57 +0000 (13:58 +0100)]
PinchArea autotest doesn't depend on window activation; QScopedPointer
The QQuickView pointer is guarded by a QScopedPointer to make sure it
will be deleted if the test fails. And because we don't depend on
window activation, the test should be parallelizable.
Change-Id: I33a5dcff037087d9752b264eb067196c2a5be535
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Mon, 4 Mar 2013 11:52:11 +0000 (12:52 +0100)]
pressedCanceledOnWindowDeactivate pops up a second window
in order to cause the first one to be deactivated.
Task-number: QTBUG-29953
Change-Id: I7fec66b07976b2afc78941d39c593f99ea484522
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Frederik Gladhorn [Mon, 4 Mar 2013 17:17:10 +0000 (18:17 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Frederik Gladhorn [Mon, 4 Mar 2013 13:12:19 +0000 (14:12 +0100)]
Stabilize tst_qquicktextinput::remoteCursorDelegate()
In some cases QCOMPARE(component.status(), QQmlComponent::Loading);
(line 2800) is failing -- it appears to be Ready immediately. Add a delay
to ensure it always hits Loading before Ready.
This is a backport of change: I975f3b3ea6004f178a7b0fb21193dcbdaf483157
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Backported since the test keeps on failing for the stable branch.
Change-Id: Ic90f1fc3de3e0a0ee75026cbebf8d99304a67b98
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Paul Olav Tvete [Wed, 27 Feb 2013 11:53:23 +0000 (12:53 +0100)]
Enablers for input methods on Android
Change-Id: Ic26722cf530e7a787e7a8f92b645e3c4883d9822
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Shawn Rutledge [Tue, 8 Jan 2013 16:30:49 +0000 (17:30 +0100)]
adding QtQuick.Dialogs, with FileDialog implementation
This will obsolete the QFileDialogItem in desktop components and be
available to all QtQuick applications. The QML FileDialog type is
dynamically defined in the plugin by detecting which implementation
will work on the current platform.
Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Gunnar Sletta [Tue, 26 Feb 2013 15:56:22 +0000 (16:56 +0100)]
Do not print out leaked pixmaps by default
Change-Id: Id112def9710efa943ffc5350a25d40d4c4f463a1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Gunnar Sletta [Wed, 27 Feb 2013 07:44:47 +0000 (08:44 +0100)]
Added examples on how to use FBOs with scene graph.
I also cleaned up the naming of the other scene graph examples a bit,
so that they sort together in the samples list and have a more obvious
naming scheme.
Task-number: QTBUG-29548
Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Tue, 26 Feb 2013 13:56:43 +0000 (14:56 +0100)]
Fix docs for Canvas.renderStrategy, the default is Cooperative
Task-number: QTBUG-29833
Change-Id: I3ee680d2decb01ff514852b2445617e6ab1b1480
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Thiago Macieira [Thu, 28 Feb 2013 20:41:03 +0000 (12:41 -0800)]
Fix the QtQml's use of plugins for value type providers
When the QtQuick library is loaded, it runs a global constructor that
installs the QtQuick value providers. But those providers are never
uninstalled when the library is unloaded, resulting in a dangling
pointer stored in QtQml's singly-linked list of value providers.
Since
cafb02911a29b98ac2652fde64e95870e70fd547, QLibrary will unload
plugins after inspecting their plugin metadata on Mac and Windows. If
QtQml is trying to load a plugin that links to QtQuick (in particular,
*the* qtquick2plugin plugin), it would cause the value provider to go
stale.
To make matters worse, it's quite likely that the plugin would get
loaded soon after, at the same address in memory, which causes the
valueTypeProvider list to become cyclic.
Change-Id: I6f4db5475ceeaba766d9e9c78f86266c9a65806a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Fri, 1 Mar 2013 14:49:09 +0000 (15:49 +0100)]
skip failing constantUpdatesOnWindow test for now
This test tries to render some frames and count them; but even 10
frames in one second seems to be too many to expect on the CI Macs.
Change-Id: Id9cd700499101ca10afeddee89bc183fef7d30d3
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
J-P Nurmi [Fri, 1 Mar 2013 12:26:50 +0000 (13:26 +0100)]
Fix TextEdit::persistentSelection docs (false by default)
Change-Id: I3576e08b2bf159250a163466f1402952c7520e8b
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Kai Koehne [Thu, 28 Feb 2013 11:41:43 +0000 (12:41 +0100)]
Mark flaky tst_qv8profilerservice test as insignificant on Mac
Task-number: QTBUG-29975
Change-Id: Ia80fab4342c365e08fde56812bd331ee7ce13bc7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Oswald Buddenhagen [Tue, 26 Feb 2013 10:45:42 +0000 (11:45 +0100)]
define MODULE_VERSION
Task-number: QTBUG-29838
Change-Id: I03ce9975ede5cff53e976409e2fabff1f56e1ea9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
J-P Nurmi [Tue, 26 Feb 2013 17:20:17 +0000 (18:20 +0100)]
GridView: fix resetColumns() to calculate the amount of columns right
Task-number: QTBUG-29822
Change-Id: I3649398f3d283bc2781daa6b3071538414653e6d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Frederik Gladhorn [Tue, 26 Feb 2013 14:20:46 +0000 (15:20 +0100)]
Allow shortcut overrides.
When delivering shortcut events, make it possible
for the current active focus item to override the focus.
The use case is having an edit/copy menu (ctrl+c) and
a text edit. When the text edit is focused, it should
override the global shortcut.
Change-Id: Ide5b94832289c32762ef7304cdc94c107301d579
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Gunnar Sletta [Mon, 25 Feb 2013 16:22:58 +0000 (17:22 +0100)]
Avoid ambiguous include guards in SG classes
These include guards stem from the olden days before the QSG
prefix and many of them are conflict prone, which can lead
to pretty bisarrer errors for the user.
Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Tue, 26 Feb 2013 12:35:46 +0000 (13:35 +0100)]
Change Canvas to use Image and antialiasing by default.
Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Jens Bache-Wiig [Sun, 24 Feb 2013 14:47:38 +0000 (15:47 +0100)]
Various improvements to Canvas examples
I noticed these examples were rather "aestetically
challenged" and decided to make it a test case for our
WIP style guidelines.
- Use consistent margins (12 px)
- Use proposed color palettes
- Use proposed fonts and header styles
I created a new Slider graphic and moved this into
the shared folder as I think it is useful for other examples.
I removed a lot of unused files which seem to have been added
but never actually used.
I also found several bugs in our implementation, including
not scaling or rotation around the correct origin.
In many cases I simplified the examples, removing
variables/sliders where they did not add significantly
to the example itself.
Change-Id: Ie09da33deaf56a3ec45a2031b87a24a8602e994a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Stephen Kelly [Mon, 25 Feb 2013 10:53:00 +0000 (11:53 +0100)]
Use qmake for package dependency resolution in cmake tests.
This allows us to remove hardcoded depends information.
Change-Id: Ia2b364a65484a2d99320cc3d45cfcbb5a0b68c6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Frederik Gladhorn [Mon, 25 Feb 2013 10:57:50 +0000 (11:57 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Josh Faust [Wed, 20 Feb 2013 19:42:56 +0000 (11:42 -0800)]
Fix headers without Qt module directory name in their includes
Fixed headers to include the Qt module directory in their #include
directives, e.g. <QtCore/QObject> instead of <QObject>.
QTBUG-29797
Change-Id: I6f61973deb4e48158d3eff896afd81ca4b8ae960
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Wed, 20 Feb 2013 14:24:50 +0000 (15:24 +0100)]
Improved documentation in the Screen attached property
It can attach to the Window now too, so needs some clarification
about when to use it that way. The orientation properties also need
more description to avoid confusion.
Change-Id: Ib537422f6001d8b64de176e60a6433b2e25551b9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Thiago Macieira [Sat, 22 Dec 2012 21:56:44 +0000 (13:56 -0800)]
Fix warnings about shadowing members
util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow]
[and others]
Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421
Reviewed-by: Alan Alpert <aalpert@rim.com>
Michael Brasser [Thu, 21 Feb 2013 14:46:56 +0000 (08:46 -0600)]
ListView's highlightMoveDuration should default to -1.
Change-Id: Ibb53cc21b4f1f301569cd7724c60cb8df978921a
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
Andrew den Exter [Sat, 16 Feb 2013 07:21:28 +0000 (17:21 +1000)]
Flickable shouldn't grab the mouse until it starts an effective move.
If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.
Task-number: QTBUG-29718
Change-Id: I3a1be4ed0132b91dca2fb0387ecefd39275a52da
Reviewed-by: Alan Alpert <aalpert@rim.com>
Andrew den Exter [Fri, 15 Feb 2013 11:29:32 +0000 (21:29 +1000)]
MouseArea shouldn't grab the mouse until there is an effective drag.
A MouseArea shouldn't prevent a parent MouseArea or Flickable from
handling a drag event unless it is going to do something useful with
it.
Task-number: 29717
Change-Id: I24016994f6cf9116382ef7faeb50b10e5716e10e
Reviewed-by: Alan Alpert <aalpert@rim.com>
Frederik Gladhorn [Thu, 21 Feb 2013 12:13:04 +0000 (13:13 +0100)]
Typos: tripple->triple
This enables grepping.
Change-Id: Ibf85800b998a02645c50b1b84d42088d16091378
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Frederik Gladhorn [Thu, 21 Feb 2013 12:17:45 +0000 (13:17 +0100)]
Stabilize clicking in QQuickTextEdit test
This test would try to emulate mouse clicks
and not wait inbetween. That can lead to clicks
spilling over to the next mouse event.
Change-Id: I320f86453215190a1c694ba49c0fc3831dcb60b9
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Gunnar Sletta [Wed, 20 Feb 2013 18:39:11 +0000 (19:39 +0100)]
Make sure exposeEvents trigger a render pass
We needs this on non-compositing window managers to trigger
repaints on partial updates.
Change-Id: Ied5f3e854173c5e00ad7e1222aeb66eb9c96158c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Johanna Aijala [Thu, 21 Feb 2013 07:17:06 +0000 (09:17 +0200)]
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
David E. Narváez [Sat, 16 Feb 2013 15:42:23 +0000 (10:42 -0500)]
Add Test for Animating Qml Dynamic Properties using QPropertyAnimation
Test case for calling QQmlVMEMetaObject::metaCall from
QPropertyAnimationPrivate::updateProperty
Task-number: QTBUG-29082
Change-Id: Iecab74132eb3a843e53356effe3b6bbe4d5a8fb2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Gunnar Sletta [Wed, 20 Feb 2013 13:21:53 +0000 (14:21 +0100)]
Don't print leak warnings on exit by default
Task-number: QTBUG-29780
Change-Id: I6f35253dbec6346af239c0ab341caad9f4f9b862
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Topi Reinio [Tue, 19 Feb 2013 10:16:56 +0000 (11:16 +0100)]
Doc: Fix paths and add missing project files for QML and Quick examples
This change fixes a number of 'example path does not exist' warnings
from qdoc, and adds .qmlproject files for pure qml examples so they'll
appear correctly in the example manifest files.
Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Tue, 19 Feb 2013 17:05:10 +0000 (18:05 +0100)]
Fix QQuickTimeLine::accel() & accelDistance()
Do not compare real numbers (velocities, accelerations and distances)
to 0.0f, but use qFuzzyIsNull() and qIsNaN().
Task-number: QTBUG-29144
Change-Id: I8fe7ebfbc9f665fa2507e66344d081ef2f43b181
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Shawn Rutledge [Mon, 18 Feb 2013 15:48:24 +0000 (16:48 +0100)]
QQuickScreen is exposed as an attached property on Window too
Change-Id: I13ee75247cbe6238de1b58cf0005c39fc4314e96
Reviewed-by: Alan Alpert <aalpert@rim.com>