platform/upstream/qtdeclarative.git
11 years agoReplace www.nokia.com by www.qt-project.org in tests.
Friedemann Kleint [Fri, 12 Jul 2013 08:11:56 +0000 (10:11 +0200)]
Replace nokia.com by www.qt-project.org in tests.

Task-number: QTBUG-32390

Change-Id: I595b1bf683d1e63e44354c042f23dd9e10847862
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoFix CLANG-warning '&&' within '||' [-Wlogical-op-parentheses].
Friedemann Kleint [Thu, 11 Jul 2013 07:59:03 +0000 (09:59 +0200)]
Fix CLANG-warning  '&&' within '||' [-Wlogical-op-parentheses].

Change-Id: Id724c86f87a78048df9b93f2d190593d36261943
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoFix CLANG-warning about unused member variable m_defaultAntialiasingMode.
Friedemann Kleint [Thu, 11 Jul 2013 07:57:58 +0000 (09:57 +0200)]
Fix CLANG-warning about unused member variable m_defaultAntialiasingMode.

Change-Id: I68a04532bacd326b4bb3eb8f9a7ee04c67fcd68e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoWindow example: delay showing the splash until Component.onCompleted
Shawn Rutledge [Thu, 11 Jul 2013 08:58:16 +0000 (10:58 +0200)]
Window example: delay showing the splash until Component.onCompleted

Otherwise it will have the wrong size on KDE.

Task-number: QTBUG-32223
Change-Id: I3ed92ff8aead5c6e5a37a5189c7103a5383087ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoAdd a unit test for testing Qt in its install location.
Stephen Kelly [Tue, 2 Jul 2013 22:13:38 +0000 (00:13 +0200)]
Add a unit test for testing Qt in its install location.

Change-Id: Ide70affa28f0ec37535b5a4ce1bcafac8ac58351
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoDocs: restore missing ListModel methods
J-P Nurmi [Mon, 8 Jul 2013 13:55:37 +0000 (15:55 +0200)]
Docs: restore missing ListModel methods

Change-Id: Icb491d14d42af769928b1663be0877e23ff43850
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFixed typo 'backens'
Thorbjørn Lindeijer [Sat, 11 May 2013 19:54:00 +0000 (21:54 +0200)]
Fixed typo 'backens'

Change-Id: I65e4492d1bc70e5344c0edc37a7c2f87fe355e62
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
11 years agoUpdate snap when snapMode changes
Albert Astals Cid [Fri, 5 Jul 2013 08:49:55 +0000 (10:49 +0200)]
Update snap when snapMode changes

Task-number: QTBUG-32258

Change-Id: Id2120acad06d7cfce988400df0067e2c0f16eb24
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix typo in Graphical Effects documentation.
Mitch Curtis [Mon, 8 Jul 2013 10:29:18 +0000 (12:29 +0200)]
Fix typo in Graphical Effects documentation.

Change-Id: Iad5ee6a965a6373941468bf98ac328e51c5c4066
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoqmlscene: ensure that the window & component get destructed
J-P Nurmi [Thu, 4 Jul 2013 10:21:04 +0000 (12:21 +0200)]
qmlscene: ensure that the window & component get destructed

Task-number: QTBUG-32207
Change-Id: Ic7c45228cbdc049d3dfdb3482296d0e8c89a930c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoRemove objectlistmodel.qmlproject file.
Friedemann Kleint [Thu, 4 Jul 2013 09:45:54 +0000 (11:45 +0200)]
Remove objectlistmodel.qmlproject file.

The example has C++ source code and cannot be run
as qmlproject.

Change-Id: I2d71d3ffc600ca71898ad402499f7a070455c266
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoItem views: do not track the geometry of items being removed
J-P Nurmi [Sat, 22 Jun 2013 13:49:26 +0000 (15:49 +0200)]
Item views: do not track the geometry of items being removed

Task-number: QTBUG-31873
Change-Id: I4230893ccb2925ed9c2429d26b411264bf7c1c65
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
11 years agoQQuickTextEdit: move QSG* members from dptr to root node.
Pierre Rossi [Mon, 1 Jul 2013 16:33:19 +0000 (18:33 +0200)]
QQuickTextEdit: move QSG* members from dptr to root node.

Subclass QSGTransform node for our use case and add the frame decorations
and cursor nodes in there.

Task-number: QTBUG-31580
Change-Id: Id2b468b53092f21134ae45e5694bc54c43660f8b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoDoc: Fix documentation of ownership of in QmlComponent::create
Kai Koehne [Tue, 2 Jul 2013 09:28:01 +0000 (11:28 +0200)]
Doc: Fix documentation of ownership of in QmlComponent::create

Fixes documentation introduced in b1ee75d377fc9517d6 : Actually the
ownership is _always_ transferred to the caller.

Change-Id: I3b50588b69fa45730ac09c46912f8319e7581a5f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix access to invalid memory in ~QQmlEnginePrivate
Kai Koehne [Tue, 2 Jul 2013 09:18:18 +0000 (11:18 +0200)]
Fix access to invalid memory in ~QQmlEnginePrivate

~QQmlEnginePrivate tries to set incubationController->d to 0. However,
we're already setting the backpointer (q) of incubationController to 0
in ~QQmlEngine, so that the IncubationController destructor might run
in between without being able to reset incubationController.

To fix this, just handle the unsetting of incubationController once, in
~QQmlEnginePrivate.

Task-number: QTBUG-32161
Change-Id: I43a72dcfc0f95938ebfa67d3998adff1fb2d05a1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoInitialize m_dirty_texture member
Gunnar Sletta [Wed, 3 Jul 2013 08:09:39 +0000 (10:09 +0200)]
Initialize m_dirty_texture member

Change-Id: I4fa2774aef9bc3258572d28425d1427151297358
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
11 years agoFix warning about change of sign: glyph_t is unsigned
Thiago Macieira [Fri, 28 Jun 2013 22:43:22 +0000 (15:43 -0700)]
Fix warning about change of sign: glyph_t is unsigned

qsgdistancefieldglyphnode_p.cpp(222): warning #68: integer conversion resulted in a change of sign

Use the value 0, which is reserved to mean "no texture"

Change-Id: I0bb135639c432ab08f6561c1d45f64e2d8f96dd7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix missing QQuickTextDocument docs
J-P Nurmi [Tue, 2 Jul 2013 15:25:49 +0000 (17:25 +0200)]
Fix missing QQuickTextDocument docs

It didn't appear in the docs at all. Moving the documentation to .cpp
fixes the problem.

Change-Id: Id9741bc6dab20ba976952143160d3551787fae40
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoDebugger: Remove handling of QT_DECLARATIVE_DEBUG macro
Kai Koehne [Mon, 1 Jul 2013 12:10:22 +0000 (14:10 +0200)]
Debugger: Remove handling of QT_DECLARATIVE_DEBUG macro

This was added originally to keep older Qt Creator versions working.
However, any newer versions automatically set QT_QML_DEBUG too, and
checking for both actively prevented selectively enabling QtQuick1 or
QtQuick2 debuggers only.

Change-Id: I4d4a984958ef3430ebe05b267bd87185005bbe51
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
11 years agoDisambiguate name of static helper from QtQuick1
Kai Koehne [Mon, 1 Jul 2013 12:07:23 +0000 (14:07 +0200)]
Disambiguate name of static helper from QtQuick1

Change name of static 'qmlEnableDebuggingHelper' variable to disambiguate
it from QtQuick1 variable with the same name.

Task-number: QTBUG-31064

Change-Id: Ia4b0f18a33a383dd4ade1bdb45506304f9066502
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
11 years agoDocument public members of QSGSimpleMaterialShader
Gunnar Sletta [Thu, 27 Jun 2013 06:21:48 +0000 (08:21 +0200)]
Document public members of QSGSimpleMaterialShader

Change-Id: I2e46989d4076ff639d7264985e030df0f1cb2a88
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMark tests tst_qquickloader as insignificant due to random failures
Tony Sarajarvi [Fri, 28 Jun 2013 08:22:51 +0000 (11:22 +0300)]
Mark tests tst_qquickloader as insignificant due to random failures

Task-number: QTBUG-30721

Change-Id: I540848b1e7c9992e89b6df2417c37ce5e81423c8
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoRelayout the text after the vertical alignment is changed
Marco Bubke [Wed, 26 Jun 2013 13:28:13 +0000 (15:28 +0200)]
Relayout the text after the vertical alignment is changed

In the designer it is no working without a layout update.

Task-number: QTBUG-32041
Change-Id: I2276914c81b38ad8931109b3d800b65a0d11bca7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoOnly emit moving change signals when moving actually changes
Aaron Kennedy [Sun, 30 Jun 2013 23:58:14 +0000 (09:58 +1000)]
Only emit moving change signals when moving actually changes

Change-Id: Ib775ce8439183388634c6b08785cd8aff4e8e174
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
11 years agoExample for running animations on the render thread
Gunnar Sletta [Mon, 24 Jun 2013 09:17:09 +0000 (11:17 +0200)]
Example for running animations on the render thread

Change-Id: I7a829f201c9d1514b2462e7f3bd11761d02cb66c
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoDocument QWindow::alert() in Qt Quick.
Friedemann Kleint [Fri, 28 Jun 2013 10:04:03 +0000 (12:04 +0200)]
Document QWindow::alert() in Qt Quick.

Task-number: QTBUG-32069
Task-number: QTBUG-30416

Change-Id: If7e9fd63d858416a23ff768272d94219595be1c5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Fri, 28 Jun 2013 17:18:39 +0000 (19:18 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02

11 years agoFileDialog.folder property should also be a QUrl, for consistency
Shawn Rutledge [Thu, 27 Jun 2013 11:08:08 +0000 (13:08 +0200)]
FileDialog.folder property should also be a QUrl, for consistency

In QtQuick we never use plain file paths, because URL is more general.
Also use const references for string and URL setters, and fixed the
dependency between the FolderListModel's folder, the field for editing it,
and the folder property of the AbstractFileDialog.

Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoQtQml: document QQmlExtensionPlugin::baseUrl
Shawn Rutledge [Wed, 26 Jun 2013 14:37:23 +0000 (16:37 +0200)]
QtQml: document QQmlExtensionPlugin::baseUrl

It was added here https://codereview.qt-project.org/#change,47532
without documentation.  Also updated \since because for now qdoc
seems to interpret \since 5.0 as QtQml 5.0.

Task-number: QTBUG-31928
Change-Id: I652e9471f1ad8e83b355bffc8498a6565dc9aa2b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoQtQuick.Dialogs: sync the docs with the implementation
Shawn Rutledge [Wed, 26 Jun 2013 13:38:11 +0000 (15:38 +0200)]
QtQuick.Dialogs: sync the docs with the implementation

We've been using URLs instead of strings for some time now, just
forgot to change the docs until now.

Task-number: QTBUG-31847
Change-Id: I49a42282aeefb95e4d367397e2f290f4af65687e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
11 years agoSwitch to non-streaming version of qWarning()
Alan Alpert [Thu, 27 Jun 2013 04:25:04 +0000 (21:25 -0700)]
Switch to non-streaming version of qWarning()

Allows us to drop the qdebug.h include in a public and frequently used
header.

Change-Id: I2cb05fbec6298ba600020db684e9eea4093ce663
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
11 years agoUndo presumably accidental line deletion
Alan Alpert [Thu, 27 Jun 2013 00:18:06 +0000 (17:18 -0700)]
Undo presumably accidental line deletion

Change-Id: I7ddb3ef9b45cfb95c48c2060dc62acd4ed9d64f9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoRequest paint if scene changes for the canvas item
Marco Bubke [Tue, 25 Jun 2013 11:37:30 +0000 (13:37 +0200)]
Request paint if scene changes for the canvas item

Otherwise for every scene the canvas is simply not painted anymore in the
designer. For example if you change the parent.

Change-Id: I4883eab44d73a59381230755f7caa596f2b6569f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agophotosurface: add C++ boilerplate launcher; open button
Shawn Rutledge [Thu, 20 Jun 2013 11:39:53 +0000 (13:39 +0200)]
photosurface: add C++ boilerplate launcher; open button

Creator refuses to build it for Android otherwise, and this is a good
demo for tablets.  Also added a button to re-open the FileDialog.

Task-number: QTBUG-31898
Change-Id: I9f90de316fcaa2679484f8a875737ffafa774f31
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
11 years agoDeclarative dialog improvements for the non-Window use case
Shawn Rutledge [Thu, 18 Apr 2013 10:30:20 +0000 (12:30 +0200)]
Declarative dialog improvements for the non-Window use case

Platforms like Android and EGL don't support multiple top-level
windows, so we have to avoid trying to use widget-based dialogs
(because a widget dialog on top of a scene graph will result in a
second window), allow the QML dialog to be an Item, and decorate it
to look like a window.

Task-number: QTBUG-31898
Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Tue, 25 Jun 2013 21:29:59 +0000 (23:29 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 25 Jun 2013 21:26:42 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6e060496b8c252fb4e2d5d2d40ae16bf950e2ec4

11 years agoQQmlTrace: getpid() requires unistd.h
Shawn Rutledge [Thu, 13 Jun 2013 15:07:38 +0000 (17:07 +0200)]
QQmlTrace: getpid() requires unistd.h

Doesn't build on MacOS if you omit this include and uncomment
define QML_ENABLE_TRACE in qqmltrace_p.h

Change-Id: I78ed43b16a006699449202dd234e43be2f7b84fd
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoUpdate 5.1.0 changelog and what's new
Alan Alpert [Sun, 23 Jun 2013 03:10:21 +0000 (20:10 -0700)]
Update 5.1.0 changelog and what's new

All the new features should now be listed in those two documents

Change-Id: Ifa17581bf589f3a18b602f8a1d10683a5e48c70d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoImprove QtQuick Item Anchors documentation.
Mitch Curtis [Mon, 24 Jun 2013 06:55:32 +0000 (08:55 +0200)]
Improve QtQuick Item Anchors documentation.

Change-Id: Ib47051be82df16e5d08df50b5327aba8c004f4d3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoTidy up Context2D transform-related documentation.
Mitch Curtis [Mon, 24 Jun 2013 08:12:35 +0000 (10:12 +0200)]
Tidy up Context2D transform-related documentation.

Also adds back some images that
61d35829eed6661c1371d397bbb316ea2f636c50 removed
(4a5d31a56dfd871f3f7c5ce162885ebc870b8803 specified the wrong paths to
all but one file, which is probably why they were cleaned up).

Change-Id: Idd42bb831c97935e53ce05c69ea2691a2769f453
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Mon, 24 Jun 2013 13:09:48 +0000 (15:09 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

11 years agoQQmlPlatform: rename "mac" to "osx"
J-P Nurmi [Mon, 24 Jun 2013 11:54:11 +0000 (13:54 +0200)]
QQmlPlatform: rename "mac" to "osx"

Change-Id: Ie458690b8008b211785cf9dcc0312a7e25c84f6b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoAdd missing Q_REVISION
Alan Alpert [Sun, 23 Jun 2013 03:10:51 +0000 (20:10 -0700)]
Add missing Q_REVISION

This invokable method is new in Qt 5.1/QtQuick 2.1

Change-Id: I7d0e332b52a815ac0722e39db68ef1f190534a57
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoemit runningChanged when AnimatedSprite stops by loops settings
Tasuku Suzuki [Mon, 3 Jun 2013 01:14:57 +0000 (10:14 +0900)]
emit runningChanged when AnimatedSprite stops by loops settings

Task-number: QTBUG-31522
Change-Id: I20718cda5f77f3a53176c8b1a4baacedd77375af
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix some Canvas/Context2D documentation issues.
Mitch Curtis [Fri, 21 Jun 2013 11:20:43 +0000 (13:20 +0200)]
Fix some Canvas/Context2D documentation issues.

Task-number: QTBUG-23597

Change-Id: I7b3c343a822c136cecec5ce9ce705f2d99466e77
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoRevert "Cut performance cost in QSGContext::prepareMaterial()".
Gunnar Sletta [Thu, 20 Jun 2013 07:31:56 +0000 (09:31 +0200)]
Revert "Cut performance cost in QSGContext::prepareMaterial()".

This reverts commit 0e9cd8b4098661bf611fa73a787c58c85e7d7338.

This optimization breaks ShaderEffects with changing fragment
and vertex shaders and needs some more thought.

Task-number: QTBUG-31837
Change-Id: I1abe249c65dd785825c249a7c22baee928bd76c8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Thu, 20 Jun 2013 14:15:09 +0000 (16:15 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6

11 years agoQColorDialogHelper: Force QWindow before setting flags
Shawn Rutledge [Wed, 19 Jun 2013 10:41:07 +0000 (12:41 +0200)]
QColorDialogHelper: Force QWindow before setting flags

This needs the same fix as the one in the QFileDialogHelper (change
I7a3b2321f4a1bf179dced8e98598559f396386db).  However to be even safer,
we can check for a null pointer before calling any methods on the
QWindow.

Task-number: QTBUG-31834
Change-Id: I319326f06fb2c92dc898fd12be86b6c7b7f87e5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDoc: Changed the title to avoid name conflicts and linking errors
Venu [Tue, 18 Jun 2013 09:42:47 +0000 (11:42 +0200)]
Doc: Changed the title to avoid name conflicts and linking errors

Task-number: QTBUG-30173

Change-Id: Ibf6626cdfc205c48ca634491661c87414bbddf24
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agofix case insensitive issue with image provider id
Tasuku Suzuki [Sat, 8 Jun 2013 06:53:09 +0000 (15:53 +0900)]
fix case insensitive issue with image provider id

Task-number: QTBUG-31614

Change-Id: I866df6e3ed6226b443640a51f66a3dbb92b31249
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoRemove use of 'register' from QtQml.
Stephen Kelly [Mon, 17 Jun 2013 14:12:31 +0000 (16:12 +0200)]
Remove use of 'register' from QtQml.

Change-Id: Id9848e3161346c7519d430c47718670cabe556de
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoPrefix internal classes properly and private export them.
Gunnar Sletta [Fri, 14 Jun 2013 17:27:01 +0000 (19:27 +0200)]
Prefix internal classes properly and private export them.

Without the private export on these classes, the private
export on the QSGDefaultImageNode and QSGDefaultTextureNode
is useless, as the symbols fail to resolve

Change-Id: I25a265a7669e5f5015c482aa24fe154c2c9a1062
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agophotosurface demo: behavior depends on initialization order
Shawn Rutledge [Thu, 13 Jun 2013 15:02:36 +0000 (17:02 +0200)]
photosurface demo: behavior depends on initialization order

The file dialog wasn't appearing on the mac.  This way seems to work.
We have a long-term bug here but this workaround will look better for
the release.

Change-Id: I8538ca5dc11a063591bc4557fd3779c5bb3768b5
Task-number: QTBUG-31699
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agostabilize tst_touchmouse.
Gunnar Sletta [Fri, 14 Jun 2013 08:28:44 +0000 (10:28 +0200)]
stabilize tst_touchmouse.

The test relies on window activation, which means that it
cannot be a parallel test.

Change-Id: I15b1c1511c38345b160aa3d01d17667dffc58c87
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoGraph example
Gunnar Sletta [Tue, 11 Jun 2013 18:47:54 +0000 (20:47 +0200)]
Graph example

Change-Id: I4a7b52f6e14182aed31354dc3860ef187e1899a4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoAdd --noinstantiate to qmlplugindump
Alan Alpert [Thu, 2 May 2013 17:42:31 +0000 (10:42 -0700)]
Add --noinstantiate to qmlplugindump

This flag allows you to run qmlplugindump on plugins which cannot safely
create objects, such as plugins with unusual requirements or missing
essential dependencies.

Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
(cherry picked from commit 0462193b6fb97fbe7ccde496c33d82d4d5fce8c0)

Change-Id: I0d1ff7f94e00a8aab94c0aff012d78db5193400f
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoOur Context2D::clearRect implementation was a bit clumsy
Gunnar Sletta [Wed, 12 Jun 2013 14:34:31 +0000 (16:34 +0200)]
Our Context2D::clearRect implementation was a bit clumsy

Change-Id: I273dd5eb73dce07a9ca0a1ac72a0780b0393603a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
11 years agoDon't show a negative size canvas.
Gunnar Sletta [Wed, 12 Jun 2013 14:35:46 +0000 (16:35 +0200)]
Don't show a negative size canvas.

This is in line with how Rectangle and Image elements
also behave.

Change-Id: I82cd6ecc6d233645bb3fd968f0f81218188a8991
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
11 years agoQFileDialogHelper: Force QWindow before setting flags.
Friedemann Kleint [Wed, 12 Jun 2013 13:42:54 +0000 (15:42 +0200)]
QFileDialogHelper: Force QWindow before setting flags.

Fixes a crash when clicking the dialog icon in the
QtQuickControls gallery example.

Change-Id: I7a3b2321f4a1bf179dced8e98598559f396386db
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoFix resizing canvas with renderStrategy == Cooperative
Gunnar Sletta [Wed, 12 Jun 2013 14:30:05 +0000 (16:30 +0200)]
Fix resizing canvas with renderStrategy == Cooperative

updatePolish() called prepare() which would use a queued
metaInvoke() to change the size of the texture. However,
there is no guaranteed event processing on the render thread
between polish on the GUI thread and sync on the render
thread, we would very often get to updatePaintNode() before
the queued invoke landed, resulting the drawing being done
to a texture of the wrong size.

Fix this by calling prepare from updatePaintNode when
in CooperativeMode so that the autoconnection becomes
a direct one and we get prepare and flush processed in
the right order.

Change-Id: I0fa4687a94ada4bdaddca19133e686bca0bc745c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoImage docs: fix the default alignment & snippets to match screenshots
J-P Nurmi [Wed, 12 Jun 2013 20:53:35 +0000 (22:53 +0200)]
Image docs: fix the default alignment & snippets to match screenshots

Change-Id: I8e72b58f5b3fed856d68e7a9284c828ae129f619
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agomove quick dialogs example into an artificial subdirectory again
Shawn Rutledge [Tue, 11 Jun 2013 12:44:10 +0000 (14:44 +0200)]
move quick dialogs example into an artificial subdirectory again

The trouble with Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc is that
the build assumes that all example directories are subdirectories, so
the examples-manifest.xml will point to the wrong place and creator
ends up not having the example on the welcome page.  That's more rigid
than it should be, but we might as well use the opportunity to
distinguish system dialogs from any QML-only dialogs that might be
added to this module later on.

Change-Id: I6e7261e096d75df560c6ce608af4c54b82e52d13
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 12 Jun 2013 12:44:16 +0000 (14:44 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie916db2bc4973016541176363d08c5dd14ff6b69

11 years agoSupport unaligned QImage strides in QSGTexture
Andrew Knight [Wed, 12 Jun 2013 07:11:06 +0000 (10:11 +0300)]
Support unaligned QImage strides in QSGTexture

If a QImage has a different stride than its width, copy the image to
relayout the memory for compatibility with glTexImage2D().

Change-Id: I74338da97d785ffb9e00820caff36466dfa46838
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix -Wpedantic warnings
Albert Astals Cid [Tue, 11 Jun 2013 14:47:57 +0000 (16:47 +0200)]
Fix -Wpedantic warnings

Don't need these extra ; and give warnings with -Wpedantic

Change-Id: I877fee2a6421b1aaa97ca3845a09d70f3b2b302b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoClean up qt quick dialogs example again
Shawn Rutledge [Tue, 11 Jun 2013 07:55:14 +0000 (09:55 +0200)]
Clean up qt quick dialogs example again

I5245a6931606673733130b1f168fddafe8def695 took us the wrong direction:
the intention was to put ALL dialogs in one example, because each
example has some overhead (project, docs, screenshot, c++ launcher)
and we don't want to have several more separate examples after the other
dialog types are added.  Color and file dialogs have no relationship
to each other except that they happened to be implemented first.
This is analogous to qtbase/examples/widgets/dialogs/standarddialogs
And in fact, each dialog type is in a separate qml file, so you can
run them individually with qmlscene anyway, which will keep this
from becoming unwieldy and hard to understand.

Change-Id: Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoMake qtdeclarative compile with QT_NO_NETWORKPROXY
Tasuku Suzuki [Sun, 12 May 2013 22:53:29 +0000 (07:53 +0900)]
Make qtdeclarative compile with QT_NO_NETWORKPROXY

Change-Id: Ie7bf1e1d15da323f901f2c6b851a7b1e8ae0d832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoEnsure the vertical text alignment is updated when the Text height changes.
Andrew den Exter [Mon, 10 Jun 2013 11:17:02 +0000 (21:17 +1000)]
Ensure the vertical text alignment is updated when the Text height changes.

Task-number: QTBUG-31647

Change-Id: Ia0968a7a40c40411df5b3ed841a42f6cef141525
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Vesa Halttunen
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoDocument drag-threshold behavior of Flickable
Alan Alpert [Fri, 17 May 2013 17:23:42 +0000 (10:23 -0700)]
Document drag-threshold behavior of Flickable

Task-number: QTBUG-31168
Change-Id: Ia9452ad9f548b5eb9684603b4ab8b10f35710eae
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
11 years agoMake qtdeclarative compile with -no-gui
Tasuku Suzuki [Thu, 2 May 2013 02:39:55 +0000 (11:39 +0900)]
Make qtdeclarative compile with -no-gui

Change-Id: I0c5a55c8f6b78450b2bce693bb55e12f8a224172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoprepare for qt_module_pris.prf changes
Oswald Buddenhagen [Fri, 7 Jun 2013 14:26:49 +0000 (16:26 +0200)]
prepare for qt_module_pris.prf changes

Change-Id: Iba75fccfc143f09d443d50bc8dc75cde5739af9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoFix compiler warning about unused parameter
Kai Koehne [Mon, 10 Jun 2013 07:48:21 +0000 (09:48 +0200)]
Fix compiler warning about unused parameter

Fix gcc compiler warning about unused parameter:

qquickwindow.cpp:111:10: warning: unused parameter ‘e’ [-Wunused-parameter]

This got introduced by commit 9d75626b

Change-Id: Ia280fd9fdd584eed81f4d810311c56f5daee3e28
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDoc: Exclude Qt Quick Dialogs examples in qtquick.qdocconf file
Topi Reinio [Mon, 10 Jun 2013 09:54:03 +0000 (11:54 +0200)]
Doc: Exclude Qt Quick Dialogs examples in qtquick.qdocconf file

Qt Quick Dialogs has its own .qdocconf file where the example path
is defined. This change removes the path from .qdocconf for Qt Quick
module so qdoc doesn't try to parse it twice.

Change-Id: I06ad6895d5929031c37e21bfa91a813ba60d86d2
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agosupport url type qml property as a source for Context2D::drawImage()
Tasuku Suzuki [Thu, 25 Apr 2013 14:58:54 +0000 (23:58 +0900)]
support url type qml property as a source for Context2D::drawImage()

Change-Id: I66445dafd64f6c47fe1098fadd83bf3af301e58d
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Mon, 10 Jun 2013 08:01:12 +0000 (10:01 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58

11 years agoDoc: fix since QtQuick 5.1
Tasuku Suzuki [Fri, 24 May 2013 14:51:33 +0000 (23:51 +0900)]
Doc: fix since QtQuick 5.1

Change-Id: I87a108e817caa06c73620dde0ba68b3c66a134c9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoAutotest: Update textedit test using textFormat
Caroline Chao [Mon, 27 May 2013 06:17:59 +0000 (08:17 +0200)]
Autotest: Update textedit test using textFormat

TextEdit does not support the StyledText format, Text does.

Add an autotest to Text to check the line counts using
different text formats.

Task-number: QTBUG-31191

Change-Id: I4670f9155bea295ba85f410988d9636eac12842c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoFix null-pointer access in QQuickVisualDataModelPrivate
Florian Hänel [Mon, 3 Jun 2013 11:40:09 +0000 (13:40 +0200)]
Fix null-pointer access in QQuickVisualDataModelPrivate

I observed null cachItem->contextData which lead to null-pointer access
on cacheItem->contextData->destroy().

Task-number: QTBUG-31439

Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoAdd future compatibility note
Alan Alpert [Fri, 31 May 2013 17:43:04 +0000 (10:43 -0700)]
Add future compatibility note

File selectors are being delayed from releasing at the same time as
QQmlApplicationEngine, but will need to be enabled by default
(in QQmlApplicationEngine only) when they do arrive. Adding a note to
the documentation to help forwards compatibility.

Change-Id: Ia47a1da1afebd0da3bd1a97e7e4c8ee85f70b49a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoSet incubation controller when a Window{} is loaded via QQmlApplicationEngine
Alan Alpert [Fri, 31 May 2013 17:38:33 +0000 (10:38 -0700)]
Set incubation controller when a Window{} is loaded via QQmlApplicationEngine

This was the one convenience that was lost when transitioning templates
from QQuickView + Item{} to QQmlApplicationEngine + Window{}.

As the default window incubation controller was tied to the first
window's frameSwapped, we could easily run into a situation where
a secondary window required incubation while the first window
was idle. This would then starve the incubation controller. Instead
make it so that the renderloop emits "timeToIncubate" once it
is done with a renderpass over all windows, so the incubator
gets to run once and exactly once per vsync when animating.

The incubator logic was also flawed in that it could post
a lot of events to itself as a result of incubatingObjectCountChanged
and thus starve system events while processing incubation requests.
Now we start a timer and don't start it again until we have
completed an incubation pass.

Task-number: QTBUG-31203
Change-Id: Iea9e2c81efb46bb7875c70ccda0cdc4b3b3e58e7
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix -Wpedantic warnings
Albert Astals Cid [Fri, 7 Jun 2013 13:20:07 +0000 (15:20 +0200)]
Fix -Wpedantic warnings

Don't need these extra ; and give warnings with -Wpedantic

Change-Id: I877fee2a6421b151697ca3845a09d70f3b2b302b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoDoc: Clarify object ownership of QObject* returned by QmlComponent::create
Kai Koehne [Thu, 6 Jun 2013 13:18:57 +0000 (15:18 +0200)]
Doc: Clarify object ownership of QObject* returned by QmlComponent::create

Link to relevant section in QQmlEngine::ObjectOwnership. It's a big gotcha
that a QObject * returned by a Qt method won't be deleted eventually, by
default.

Change-Id: I2367b7ae2673adc7fa181b759c79683091020462
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoDoc: Fixed link to Qt Quick Layouts and made links consistent
Jerome Pasion [Thu, 6 Jun 2013 12:51:31 +0000 (14:51 +0200)]
Doc: Fixed link to Qt Quick Layouts and made links consistent

-better to use the "QML Types" pages as the version is not specified.

Change-Id: I5b150bc8ada25c619dbecb5d68e70854dd9c14d6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoadd missing dependency check to widgets plugin
Xingtao Zhang [Thu, 6 Jun 2013 15:59:27 +0000 (23:59 +0800)]
add missing dependency check to widgets plugin

QtQuick widgets plugin depends on both QtWidgets and QtQuick module, if
do not check 'quick', there will be an error: "Project ERROR: Unknown
module(s) in QT: quick" when running make if failed to check for QtQuick
module due to no opengl/es1/es2 found during config test.

Change-Id: I39d78b9cd9aa9c7f0acf79fdcfc06749ffc10e31
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoDoc: Fixed QCH listings for Qt QML and Qt Quick Dialogs
Jerome Pasion [Wed, 5 Jun 2013 12:15:10 +0000 (14:15 +0200)]
Doc: Fixed QCH listings for Qt QML and Qt Quick Dialogs

Qt QML: added QML types page as a child in the list
Qt Quick Dialogs: "manual" as type taken out

Change-Id: I95d77b7582a0f5729801e1e6fb8f5f3242a0b760
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agodoc fix
Alan Alpert [Tue, 4 Jun 2013 22:32:36 +0000 (15:32 -0700)]
doc fix

Task-number: QTBUG-31539
Change-Id: I527ed10231c112f8f1727fde093f7d661d492fa6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Update Qt Quick Controls description
Caroline Chao [Tue, 4 Jun 2013 08:08:22 +0000 (10:08 +0200)]
Doc: Update Qt Quick Controls description

Change-Id: Ifb67ae32fcb8abe49166346fa1017dc5c76bc485
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoStabilize tst_qquickanimatedimage::mirror_notRunning()
Gunnar Sletta [Tue, 4 Jun 2013 07:01:36 +0000 (09:01 +0200)]
Stabilize tst_qquickanimatedimage::mirror_notRunning()

Task-number: QTBUG-31370
Change-Id: I200d94dccd1314c891df92576b0d2b704e530e16
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoqmlscene: if top-level is a QQuickWindow, set incubation controller
Shawn Rutledge [Fri, 31 May 2013 13:33:45 +0000 (15:33 +0200)]
qmlscene: if top-level is a QQuickWindow, set incubation controller

The necessity for this is documented in the
QQuickWindow::incubationController() accessor.  Bug 31203 is about
writing a custom main() with a QQmlApplicationEngine, not about
qmlscene, but the same workaround is necessary for both.  Hopefully
soon we find a way to make it unnecessary, but for now it is.
This fix also doesn't take care of the QtObject { Window { } }
use case.

Task-number: QTBUG-31203
Change-Id: Ic9a5e4a23ac918593138dc9cab3de6cd36453eaf
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoDoc: Clarified members of QtQml.Models submodule.
Jerome Pasion [Thu, 30 May 2013 09:09:13 +0000 (11:09 +0200)]
Doc: Clarified members of QtQml.Models submodule.

-Took out  members of QtQml.Models submodule from Qt QML and Qt Quick.
-Set up qdocconf files to include QtQml.Models to be part of Qt QML
 doc build.
-Edited the sentences to make it clearer that list and model types
 are in QtQml.Models.
-Placed the Visual* types back to QtQuick 2 module.

-This patch removes several collision pages.

Change-Id: I16e7045162af6852e5d6c3162b6f4cf97a42402b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoUpdate Changes file
Alberto Mardegan [Thu, 30 May 2013 07:36:09 +0000 (10:36 +0300)]
Update Changes file

Mention the behavioral change introduced by the fix for QTBUG-29836.

Task-number: QTBUG-29836
Change-Id: I15ffd32fd5c0d537528f7b1386691103dab371c7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoQQmlPropertyCache: check methods before properties
Alberto Mardegan [Wed, 29 May 2013 08:29:52 +0000 (11:29 +0300)]
QQmlPropertyCache: check methods before properties

When creating the QQmlPropertyData, search within the methods list
before searching for properties. The reason is that if the meta object
is dynamic, looking up a property will always return a result (if the
property doesn't exist, it will be created) and therefore all methods
will be obscured.
By swapping the search order, we eliminate this risk (methods are not
dynamically added).

Task-number: QTBUG-29836
Change-Id: Ie367f757c37ef4bc834a6c1c009f27bcf344fe76
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFallback to QMetaObject for properties not in QQmlPropertyCache
Alberto Mardegan [Fri, 24 May 2013 07:46:39 +0000 (10:46 +0300)]
Fallback to QMetaObject for properties not in QQmlPropertyCache

QQmlOpenMetaObject does not update the QQmlPropertyCache when new
properties are added, meaning that the QQmlPropertyCache might not
contain all of the dynamic properties of an object. Therefore, make
QQmlPropertyCache fallback to reading the QMetaObject when a property is
not found.

Task-number: QTBUG-31226
Change-Id: I760aaa155b1952f6f52ab9ce173fb9547f8e34a6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoDeprecate the with statement in QML
Simon Hausmann [Wed, 29 May 2013 09:14:51 +0000 (11:14 +0200)]
Deprecate the with statement in QML

It is generally considered deprecated in JavaScript and its use disables
a whole range of optimizations that we would like to apply in the future.

Therefore this patch will issue a warning if the with statement is detected.

This change is also documented, along with the plan on enabling strict mode
in the future.

Change-Id: Ie60f0536e0bdd6ecc537d8e34efbd8868bcad743
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Fri, 31 May 2013 11:48:17 +0000 (13:48 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie4ce4c3e64f093eec26754e06199d350a46ae2a2

11 years agoStabilize tst_touchmouse
Gunnar Sletta [Fri, 31 May 2013 10:17:20 +0000 (12:17 +0200)]
Stabilize tst_touchmouse

Change-Id: I6d34571b85f99f780b03f7871f39dbf3be546006
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoPrecompile the most common materials
Gunnar Sletta [Fri, 19 Apr 2013 13:30:41 +0000 (15:30 +0200)]
Precompile the most common materials

Change-Id: Idfa76f9fcdbac61a248b38e1f793a6628af12552
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix assert when calculating the implicit width of truncated lines.
Andrew den Exter [Fri, 31 May 2013 02:13:40 +0000 (12:13 +1000)]
Fix assert when calculating the implicit width of truncated lines.

Guard against reading past the end of the final line.

Task-number: QTBUG-31471

Change-Id: I489f742936ee16f12ad9762b7c0891bfa9377e21
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
11 years agoDo not use QApp::arguments() to select antialiasing mode.
Gunnar Sletta [Fri, 31 May 2013 07:29:48 +0000 (09:29 +0200)]
Do not use QApp::arguments() to select antialiasing mode.

This selection typically interfers with an application's command line
arguments. Creator's qml2puppet needs to set this mode to avoid
getting subpixel antialiased text from DesignerSupport.

Change-Id: Iabf2bece211b897c58e2933d5502fdcf7c360c55
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>