profile/ivi/qtdeclarative.git
12 years agoDoc: Adding qtdeclarative documentation configuration files.
Jerome Pasion [Fri, 30 Sep 2011 14:08:08 +0000 (16:08 +0200)]
Doc: Adding qtdeclarative documentation configuration files.

We need a modularized Qt Quick documentation package that only
contains Qt Quick 2.

Add a make target for the documentation.
Copied Qt 5's offline style as a starting CSS template.

Change-Id: I2298f23c7695ebbe38f43b89626431a2e8059a9a
Reviewed-on: http://codereview.qt-project.org/5891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix floating images in QSGTextNode
Eskil Abrahamsen Blomfeldt [Wed, 5 Oct 2011 10:13:31 +0000 (12:13 +0200)]
Fix floating images in QSGTextNode

When images are floating and we encounter the object replacement
character, we should ignore them, as they're done by special
handling of the QTextFrame. We also need to make sure they are
not attempted inlined by passing the layout position of the frame
to addTextObject(), and we need to set a valid QTextLine for the
object to make sure it's added to the graph.

Change-Id: Ia43ef3fd4bb9c7b48e0862071118ee0f176212bd
Reviewed-on: http://codereview.qt-project.org/6036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoMake sure the Image texture provider does not return an atlassed texture
Gunnar Sletta [Wed, 5 Oct 2011 07:38:32 +0000 (09:38 +0200)]
Make sure the Image texture provider does not return an atlassed texture

This has the implication that textures from texture providers are always
the complete texture with coordinates from 0-1, which is means we get
a copy for atlas textures which may end up affecting performance.

Alternatives are:
 - ShaderEffect does this, which means texture providers can provide
   atlas textures.
 - We expose the subrect to ShaderEffect, which means an API
   change in all shader effect classes, and let the vertex shader
   solve this. Worst API, fastest and most memory efficient.

Change-Id: Id58eb866f315012637345a6f731626abf4a7a86c
Reviewed-on: http://codereview.qt-project.org/6029
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoSupport atlased textures in QSGNinePatchNode
Gunnar Sletta [Wed, 5 Oct 2011 07:37:24 +0000 (09:37 +0200)]
Support atlased textures in QSGNinePatchNode

Change-Id: I0433d15c22d0f7b9de2d5a5590f51a554e56a912
Reviewed-on: http://codereview.qt-project.org/6028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoV8Debugger: Code beautification
Kai Koehne [Wed, 5 Oct 2011 07:20:51 +0000 (09:20 +0200)]
V8Debugger: Code beautification

Convert to from QString to QByteArray only when necessary. Also
move private methods into private class.

Change-Id: Iac28990f16c588e0172356c9395b7771f01f4817
Reviewed-on: http://codereview.qt-project.org/6022
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoEnsure all persistent handles are disposed properly
Chris Adams [Wed, 5 Oct 2011 07:37:12 +0000 (17:37 +1000)]
Ensure all persistent handles are disposed properly

Previously, some handles were leaking, which was causing a dramatic
slowdown in v8 gc speed over time.

Change-Id: I1e8d674b48647b7a0063a4b1c8d83130795502a0
Reviewed-on: http://codereview.qt-project.org/6026
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoSet isRoot correctly for value types
Aaron Kennedy [Wed, 5 Oct 2011 07:32:05 +0000 (17:32 +1000)]
Set isRoot correctly for value types

Change-Id: I1ddbe5a76fd804df51a3feaf1c0a9004a67abf9f
Reviewed-on: http://codereview.qt-project.org/6023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDeclarative: Compile on Windows.
Friedemann Kleint [Fri, 30 Sep 2011 12:29:05 +0000 (14:29 +0200)]
Declarative: Compile on Windows.

Initial-patch-by: Kent Hansen <kent.hansen@nokia.com>
Change-Id: Ieb7ff0537b641597fd0334ae1cb359f89c45ad50
Reviewed-on: http://codereview.qt-project.org/5871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd .pro file to auto test dir
Alan Alpert [Tue, 4 Oct 2011 07:27:39 +0000 (17:27 +1000)]
Add .pro file to auto test dir

Also stabilize some tests

Change-Id: I1b508756ffca6a05d495c52d84f46fcaeafe879a
Reviewed-on: http://codereview.qt-project.org/5952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoSprites can now have varying width and height
Alan Alpert [Wed, 5 Oct 2011 01:26:57 +0000 (11:26 +1000)]
Sprites can now have varying width and height

Varying between Sprites, or between width and height, not within a
single Sprite. For ImageParticle only, SpriteImage changes will be in a
later commit.

Also adds spriteInterpolation boolean.

Change-Id: I80681e44f26985a6f6a6b83bd162f6231c7f28c4
Reviewed-on: http://codereview.qt-project.org/6002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSplit GroupGoal out of SpriteGoal
Alan Alpert [Tue, 4 Oct 2011 04:39:21 +0000 (14:39 +1000)]
Split GroupGoal out of SpriteGoal

Leaving SpriteGoal alone for a few weeks with a deprecation message, but
a functioning GroupGoal has been added.

Change-Id: I395046c00526e7caa38bdbc499a8191308c476fa
Reviewed-on: http://codereview.qt-project.org/5950
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMark failing tests as insignificant.
Toby Tomkins [Wed, 5 Oct 2011 03:53:45 +0000 (13:53 +1000)]
Mark failing tests as insignificant.

Change-Id: I5aa4d13fb44c2ec184d405b075d71244782247a9
Reviewed-on: http://codereview.qt-project.org/6007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMissed a spot when refactoring activeGroup
Alan Alpert [Tue, 4 Oct 2011 07:39:31 +0000 (17:39 +1000)]
Missed a spot when refactoring activeGroup

Change-Id: Ia6b884557876efb98ab1e0785102cd81de9bbbed
Reviewed-on: http://codereview.qt-project.org/5966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoUpdate particles autotests to not use SRCDIR
Alan Alpert [Tue, 4 Oct 2011 04:17:50 +0000 (14:17 +1000)]
Update particles autotests to not use SRCDIR

Change-Id: I1b508756ffca6a05d495c52d84f46fcaeafe8797
Reviewed-on: http://codereview.qt-project.org/5947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoCouple more performance tips.
Martin Jones [Tue, 4 Oct 2011 23:05:40 +0000 (09:05 +1000)]
Couple more performance tips.

Change-Id: Id0f5db95addd6ecc6c2816ba8dbfae58fa8e231f
Reviewed-on: http://codereview.qt-project.org/6001
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoqmlplugindump: Add test for running with -builtins.
Christian Kamm [Tue, 4 Oct 2011 10:22:07 +0000 (12:22 +0200)]
qmlplugindump: Add test for running with -builtins.

The main idea is to check for crashes: When instantiable C++ based
QML components have uninitialized QObject * members, qmlplugindump can
crash while collecting types to dump. That will make it impossible
for users to use qmlplugindump and should be fixed in the responsible
classes constructor.

On unix it has a crash handler that tries to pinpoint which class
and property caused the problem.

Change-Id: Ie049cae27d94920f3d8346ca7075eba5a11c2a37
Reviewed-on: http://codereview.qt-project.org/5976
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoUse QCoreApplication to get the qml debug arguments
Kent Hansen [Fri, 30 Sep 2011 12:44:53 +0000 (14:44 +0200)]
Use QCoreApplication to get the qml debug arguments

The debug arguments string was moved from QApplication
to QCoreApplication as part of the Qt refactor/library
split, so there's no need to depend on QGuiApplication.

Change-Id: I0eb87be318b80290be656d707e3d38020f765a90
Reviewed-on: http://codereview.qt-project.org/5883
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoInitialize members in the right order
Kent Hansen [Fri, 30 Sep 2011 12:25:40 +0000 (14:25 +0200)]
Initialize members in the right order

... to fix compiler warning.

Change-Id: I3328d17b498b22d9c8703d0f034b3b9f944c1b17
Reviewed-on: http://codereview.qt-project.org/5880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agomore debug
Gunnar Sletta [Tue, 4 Oct 2011 07:53:04 +0000 (09:53 +0200)]
more debug

Change-Id: I49c76424bd987059e74c0f13826d3ca7dd07e7ef
Reviewed-on: http://codereview.qt-project.org/5967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoAdd debug description to QSGDistanceFieldGlyphNode
Gunnar Sletta [Thu, 29 Sep 2011 19:25:02 +0000 (21:25 +0200)]
Add debug description to QSGDistanceFieldGlyphNode

Change-Id: If66482f6e00bfade2da3b9067ff51ef782cd486e
Reviewed-on: http://codereview.qt-project.org/5849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agomove depth logic out of QSGRenderer
Gunnar Sletta [Thu, 29 Sep 2011 19:00:19 +0000 (21:00 +0200)]
move depth logic out of QSGRenderer

Change-Id: I1fc3baf858664ea9648922204fa0e4d5ca64d740
Reviewed-on: http://codereview.qt-project.org/5848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoHave textureId() return the correct value and document this behavior
Gunnar Sletta [Tue, 4 Oct 2011 08:41:13 +0000 (10:41 +0200)]
Have textureId() return the correct value and document this behavior

Change-Id: Ia75b5fc3b6c9f15bb15e8850295c33ba32a485f1
Reviewed-on: http://codereview.qt-project.org/5970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agodeploy testdata properly for qsgcanvasitem
Charles Yin [Mon, 3 Oct 2011 23:35:05 +0000 (09:35 +1000)]
deploy testdata properly for qsgcanvasitem

Change-Id: I7e5d907a4ba41ad077ea7bc91c5eba255312c41e
Reviewed-on: http://codereview.qt-project.org/5960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agodeply testdata properly for qmltest
Charles Yin [Mon, 3 Oct 2011 23:35:19 +0000 (09:35 +1000)]
deply testdata properly for qmltest

Change-Id: I9ac2df09c5297a20934b219c3312c8a22011546a
Reviewed-on: http://codereview.qt-project.org/5961
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoDoc: Moving doc/src/declarative/pics/* to doc/src/images.
Jerome Pasion [Mon, 3 Oct 2011 10:10:56 +0000 (12:10 +0200)]
Doc: Moving doc/src/declarative/pics/* to doc/src/images.

Consolidates all the declarative pictures into one directory.
-kept contents of doc/src/qtquick1/pics.
-qdocconf file only looks at doc/src/images and therefore qdoc3
 does not find images outside of that directory.

Change-Id: I9da431f54c93d8b397accc1124a273758466994b
Reviewed-on: http://codereview.qt-project.org/5921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoDoc: Converting the overviews' \e commands to \i commands.
Jerome Pasion [Mon, 3 Oct 2011 08:57:39 +0000 (10:57 +0200)]
Doc: Converting the overviews' \e commands to \i commands.

\e commands are deprecated and are only supported through an alias.
We should use the official command and not the deprecated command.

Change-Id: Icf88b9cda673f436dd855f22960112d0a37c74eb
Reviewed-on: http://codereview.qt-project.org/5918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years ago(private-) export of QSGShaderEffectSource.
juhvu [Mon, 3 Oct 2011 06:06:24 +0000 (16:06 +1000)]
(private-) export of QSGShaderEffectSource.

QtLocation maps need to be able to render standard QML elements as
Map items (for example a convenience store logo and text). Prior to
Qt5 this was achieved with Qt graphics view framework.

Only really private symbol used, in addition to inheriting a class from
QSGShaderEffectSource, is textureProvider(). It is used to access
texture IDs, which can then be used to map textures to map item
geometries.

Change-Id: Ifc6cf1d20b11493738c77b3bde9972a8cb1c70ce
Reviewed-on: http://codereview.qt-project.org/5912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoQDeclarativeIncubator autotests
Aaron Kennedy [Tue, 4 Oct 2011 00:42:37 +0000 (10:42 +1000)]
QDeclarativeIncubator autotests

Change-Id: Ib1b70903c5aa82fc1112c17db1b676b4740ea685
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix incorrect index when accumulating multiple removes.
Andrew den Exter [Fri, 30 Sep 2011 07:52:27 +0000 (17:52 +1000)]
Fix incorrect index when accumulating multiple removes.

Don't remove the intersecting count from the current remove twice,
and accumulate consecutive not just overlapping removes.

Change-Id: I426d764d980ee17ad114aa03ca4089da89c6aed2
Reviewed-on: http://codereview.qt-project.org/5902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agotest: fixed testdata deployment for tst_qdeclarativelanguage
Rohan McGovern [Mon, 3 Oct 2011 23:57:54 +0000 (09:57 +1000)]
test: fixed testdata deployment for tst_qdeclarativelanguage

Make it feasible to deploy the testdata onto a device.

Task-number: QTBUG-21721
Change-Id: I69e860e17ff9a4882997dd28480856847f230e83
Reviewed-on: http://codereview.qt-project.org/5667
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoExported QSGMouseArea and QSGMouseEvent as private exports.
juhvu [Thu, 22 Sep 2011 05:20:07 +0000 (15:20 +1000)]
Exported QSGMouseArea and QSGMouseEvent as private exports.

QtLocation uses QSGMouseAreas internally in the MapMouseArea and
MapMouse event (it can't support standard MouseAreas due to its domain
specific requirements). Exporting those classes as private exports will
enable significant code re-use.

Dependencies on privates of other modules is never ideal, but it is
notable that MapMouseAreas use only the public properties of the
QSGMouse classes. Exports are needed to be able to instantiate them
as well as to connect to their property signals (and work without
reinterpret casts).

(Copying QSGMouse classes to QtLocation is not practical they are very
intertwined with QSG internals).

Change-Id: I98651f9d525abc3b7319e027e47c71b3e3c5fe51
Reviewed-on: http://codereview.qt-project.org/5352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAllow .pragma library scripts to import other scripts
Chris Adams [Fri, 23 Sep 2011 01:58:39 +0000 (11:58 +1000)]
Allow .pragma library scripts to import other scripts

Previously, a .pragma library script would have a new context which
did not have an engine set.  If the script then imported other scripts
a crash would occur due to dereferencing the (null) engine ptr.

This commit ensures that even if no parent context is used (eg, for
shared scripts which don't import the parent context) the engine from
the parent context is used as the engine in the new context.

Finally, unit tests for the .pragma library import with imports cases
were added to tst_qdeclarativeecmascript.

Task-number: QTBUG-21620
Change-Id: I671ffc9eee98a69cce7c169ce5b9d5aae4d1ff0d
Reviewed-on: http://codereview.qt-project.org/5421
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agouse QWindows's format so users can override
Gunnar Sletta [Thu, 29 Sep 2011 18:59:00 +0000 (20:59 +0200)]
use QWindows's format so users can override

Change-Id: I3dd2d1ff63acb672ef4943cf8347c5c10f2d9466
Reviewed-on: http://codereview.qt-project.org/5847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoQDeclarativeIncubator::clear() and autotests
Aaron Kennedy [Mon, 3 Oct 2011 05:45:51 +0000 (15:45 +1000)]
QDeclarativeIncubator::clear() and autotests

Change-Id: I2a14c01c7f9412459572e9960cb95a4c24e068aa
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5911
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDon't draw itty-bitty particles
Alan Alpert [Thu, 15 Sep 2011 07:29:06 +0000 (17:29 +1000)]
Don't draw itty-bitty particles

They look terrible when rounding errors catch up. Jerky movement and
flickering between N and N+1 square pixels when rendered.

Change-Id: Id27caa38de70a10537382962cc29a0f1254a91fc
Reviewed-on: http://codereview.qt-project.org/4949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoDon't layout while applying model changes
Bea Lam [Mon, 3 Oct 2011 01:03:39 +0000 (11:03 +1000)]
Don't layout while applying model changes

Task-number: QTBUG-21742
Change-Id: I0e01b9ac9f033108410ccd431329dd7d50edb8f2
Reviewed-on: http://codereview.qt-project.org/5903
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agocurrentIndex not updated correctly if list is initially empty
Bea Lam [Thu, 29 Sep 2011 04:50:27 +0000 (14:50 +1000)]
currentIndex not updated correctly if list is initially empty

The currentIndex shouldn't be incremented when itemCount == 0 and
also it should be default to 0 after the first item is added.

Task-number: QTBUG-21643
Change-Id: Ia9418c0cd1cd659410123394c880dfe72557fa16
Reviewed-on: http://codereview.qt-project.org/5768
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoInitial commit of particle system autotests
Alan Alpert [Fri, 30 Sep 2011 08:25:17 +0000 (18:25 +1000)]
Initial commit of particle system autotests

Just some basic autotests for most of the elements.

Change-Id: I2d289f38f362a38c69e03ff92154c98db3c4c486
Reviewed-on: http://codereview.qt-project.org/5844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix order of QSGItem mouse filtering.
Martin Jones [Mon, 3 Oct 2011 00:59:16 +0000 (10:59 +1000)]
Fix order of QSGItem mouse filtering.

QGraphicsView filtered child items beginning with the item's
parent, grandparent, greatgrandparent... QSGCanvas did the
opposite, which breaks the QML mouse handling element filtering logic.

Task-number: QTBUG-21446
Change-Id: I18e125305eef536237195895a7f41f88b532d4aa
Reviewed-on: http://codereview.qt-project.org/5819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoDon't move content forwards when items are moved down
Bea Lam [Fri, 23 Sep 2011 01:40:25 +0000 (11:40 +1000)]
Don't move content forwards when items are moved down

Previously, if items moved down within a view, the content position
would effectively drop down. E.g. for a (0,5,3) move that moved 3
items from 0 to 5, the content y would move to the position of index
3, since it became the new first item. However, this makes it
difficult to move transitions for move() operations in these cases
since these items do not move (since the content position moves
instead). With this fix, the content position does not move, and items
will always move if they are moved.

Note this behaviour was previously implemented for backwards
movements, e.g. a (5,0,3) move but was not enabled for a forwards
(0,5,3) move.

Change-Id: I1c5a19e3c36347a4aa0cf6e31c975967a7eeada9
Reviewed-on: http://codereview.qt-project.org/5576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDeclarative: Compile fix for Windows.
Friedemann Kleint [Fri, 30 Sep 2011 12:46:12 +0000 (14:46 +0200)]
Declarative: Compile fix for Windows.

Change-Id: I0e4d61aa400094b3b059c836ee9145c1af989f00
Reviewed-on: http://codereview.qt-project.org/5881
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoInclude the textureid/glyph cache in the material sorting
Gunnar Sletta [Fri, 30 Sep 2011 13:46:17 +0000 (15:46 +0200)]
Include the textureid/glyph cache in the material sorting

Change-Id: Ic9740081e9e0e53801bbda64f6b147ab74102663
Reviewed-on: http://codereview.qt-project.org/5887
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoDeclarative: Fix ASCII conversion warnings.
Friedemann Kleint [Fri, 30 Sep 2011 11:50:59 +0000 (13:50 +0200)]
Declarative: Fix ASCII conversion warnings.

Change-Id: Ide43c1e37eeda8e5dc2c2d24b99c3b4f96e1b53e
Reviewed-on: http://codereview.qt-project.org/5867
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agotests for canvas and a few bug fixes
Charles Yin [Thu, 22 Sep 2011 10:01:29 +0000 (20:01 +1000)]
tests for canvas and a few bug fixes

Change-Id: Icbbc7f2a0fe3b908963ce18afef51e25ea0170a0
Reviewed-on: http://codereview.qt-project.org/5805
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoModify JS Object to QVariant conversion
Chris Adams [Mon, 26 Sep 2011 04:25:36 +0000 (14:25 +1000)]
Modify JS Object to QVariant conversion

Previously, JS Objects would be converted to a QVariantMap where
each value in the map was a QVariant from toVariant(propertyValue).
Unfortunately, this would result in a crash if the object had a
reference to another object which had a reference to the original
object, due to the circular reference.

This commit changes the conversion code to use
QV8Engine::variantMapFromJS() instead, which avoids cyclic references.

Task-number: QTBUG-21626
Change-Id: I129048c8704ae0d1095a02d0ce4c0fe5850b1b20
Reviewed-on: http://codereview.qt-project.org/5490
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix text input delay related test failures.
Andrew den Exter [Thu, 29 Sep 2011 02:31:30 +0000 (12:31 +1000)]
Fix text input delay related test failures.

Allow a small delay after mouse or key events for the events to be
processed before verifying the result, and use the QTRY_ macros to be
doubly sure.

Task-number: QTBUG-21690
Change-Id: I44e7fa58ef2e57572b6e342af7f4f18649144770
Reviewed-on: http://codereview.qt-project.org/5763
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoRemove a few unneeded includes
Kent Hansen [Thu, 29 Sep 2011 09:36:24 +0000 (11:36 +0200)]
Remove a few unneeded includes

Change-Id: I63a9cda5000cc872ad5a5d3c4b55243b8afb0527
Reviewed-on: http://codereview.qt-project.org/5782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix compilation with c++0x
Kent Hansen [Thu, 29 Sep 2011 11:36:30 +0000 (13:36 +0200)]
Fix compilation with c++0x

Change-Id: I5d94cfc03c2ecb9a49e185d23689c11f200ca907
Reviewed-on: http://codereview.qt-project.org/5794
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoRemove Symbian-specific code from tests.
Jason McDonald [Wed, 28 Sep 2011 06:52:12 +0000 (16:52 +1000)]
Remove Symbian-specific code from tests.

Symbian is not a supported platform for Qt5, so this code is no longer
required.

Change-Id: I5cb6d3b41fbb9fa5fea6176ad949e4e7be7c30b5
Reviewed-on: http://codereview.qt-project.org/5767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRefactor ParticleSystem members
Alan Alpert [Thu, 29 Sep 2011 01:22:50 +0000 (11:22 +1000)]
Refactor ParticleSystem members

Leave m_ for private members.

Change-Id: Ia20565a7af6c5db45923eb349238b94b88472f7b
Reviewed-on: http://codereview.qt-project.org/5762
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoImprove QDeclarativeIncubator JS API
Aaron Kennedy [Fri, 30 Sep 2011 04:26:28 +0000 (14:26 +1000)]
Improve QDeclarativeIncubator JS API

Change-Id: Ic06af88a8be68b41f563bfd6cd7322375cd29224
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5827
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd a QSGCanvas incubation controller
Aaron Kennedy [Fri, 30 Sep 2011 04:26:56 +0000 (14:26 +1000)]
Add a QSGCanvas incubation controller

Change-Id: I0324c32240746b013eeefaae2dfaa390d6e777e5
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5828
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix issue with interpolating more than one path segment backwards.
Michael Brasser [Thu, 29 Sep 2011 23:04:11 +0000 (09:04 +1000)]
Fix issue with interpolating more than one path segment backwards.

Change-Id: I463010ed63d41be80db96e8306aef8caa3863ccf
Reviewed-on: http://codereview.qt-project.org/5821
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoText format AutoText should use StyledText instead of RichText.
Yann Bodson [Fri, 30 Sep 2011 03:55:07 +0000 (13:55 +1000)]
Text format AutoText should use StyledText instead of RichText.

Task-number: QTBUG-21723
Change-Id: Ife213be95985ad1022e2f60241e69ecd9f467caf
Reviewed-on: http://codereview.qt-project.org/5825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoRemove unnecessary members
Aaron Kennedy [Fri, 30 Sep 2011 00:10:13 +0000 (10:10 +1000)]
Remove unnecessary members

Change-Id: I9dcdd2333c42aff8a648d5caaa4411c342923d42
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5822
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoExpand documentation for QObject Module APIs
Chris Adams [Fri, 16 Sep 2011 06:32:19 +0000 (16:32 +1000)]
Expand documentation for QObject Module APIs

Previously, it was unclear whether or not a QObject Module API property
could be the target of an alias property.  This commit makes it clear
that a QObject Module API property cannot be aliased as the import
qualifier of the Module API does not identify an object within the
same component of any item which may wish to alias the module API.

Task-Number: QTBUG-21420
Change-Id: Ia286edfee4dcf1250e883738f219f8aef67c32eb
Reviewed-on: http://codereview.qt-project.org/5057
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoSupport rich text elements in QSGTextNode
Eskil Abrahamsen Blomfeldt [Mon, 19 Sep 2011 14:46:38 +0000 (16:46 +0200)]
Support rich text elements in QSGTextNode

In order to have the same text rendering mechanism regardless
of the contents of the document, we need to implement rich
text layout elements in the scene graph.

Currently we support the following:
- Text objects, floating and inline (including images)
- Tables
- Lists
- Only solid borders
- Frame background colors
- All the HTML text/text layout/font manipulation

Not supported yet:
- Other border types
- Border radius
- <hr />

Task-number: QTBUG-20917
Change-Id: I4112940e6bc4ad74ae749a727acdd7e6fec3f871
Reviewed-on: http://codereview.qt-project.org/5803
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFix tst_qsgmousearea clickThrough() test stability.
Martin Jones [Thu, 29 Sep 2011 03:55:36 +0000 (13:55 +1000)]
Fix tst_qsgmousearea clickThrough() test stability.

Change-Id: Iee87ea8e62bffd743e522f969c34fbc2f0a1443e
Reviewed-on: http://codereview.qt-project.org/5766
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoEnsure JS-owned QObjects are cleaned up on v8engine dtor
Chris Adams [Mon, 22 Aug 2011 05:04:01 +0000 (15:04 +1000)]
Ensure JS-owned QObjects are cleaned up on v8engine dtor

This commit ensures that the garbage collector is invoked during
engine destruction.  This commit also adds a unit test which
ensures that the JS GC destroys JS-owned C++ objects correctly
when the QDeclarativeEngine is destroyed.

Task-number: QTBUG-20377
Change-Id: I2de1f2dfd1e60cc2f76abb523b99bf169d2a5a13
Reviewed-on: http://codereview.qt-project.org/3285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDon't crash when QSGViewSection has a null parent.
Christian Kamm [Thu, 29 Sep 2011 12:57:25 +0000 (14:57 +0200)]
Don't crash when QSGViewSection has a null parent.

This is required to make qmlplugindump work.

Change-Id: I041adde3e48759f9c3ae166c887a26ccb8f264f9
Reviewed-on: http://codereview.qt-project.org/5800
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoCompile after changes to QtBase
Lars Knoll [Thu, 29 Sep 2011 12:12:59 +0000 (14:12 +0200)]
Compile after changes to QtBase

qmime.h got removed in QtBase, compile again
after that change.

Change-Id: I3e9a0454a4528db1b96d901e93ef763ba15d1a1e
Reviewed-on: http://codereview.qt-project.org/5795
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoRemove more QByteArray<->QString conversions
Kent Hansen [Thu, 29 Sep 2011 08:29:22 +0000 (10:29 +0200)]
Remove more QByteArray<->QString conversions

Prefer to store types as QStrings. It's only when we manipulate
raw (compiled, meta-)data that utf conversion is needed.

Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb
Reviewed-on: http://codereview.qt-project.org/5781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix warning: QString(const char*) is deprecated
Kent Hansen [Wed, 28 Sep 2011 11:38:41 +0000 (13:38 +0200)]
Fix warning: QString(const char*) is deprecated

Use fromUtf8() like the other functions in this class do.

Change-Id: If25c8e8dc2562f68774002bfd11719227cbb4713
Reviewed-on: http://codereview.qt-project.org/5715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoQDeclarativeIncubationController docs
Aaron Kennedy [Thu, 29 Sep 2011 08:10:39 +0000 (18:10 +1000)]
QDeclarativeIncubationController docs

Change-Id: I1f5be66e111da7c94632de7adb318a056dd42ab0
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5780
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDeclarative: Compile on Windows.
Friedemann Kleint [Wed, 28 Sep 2011 14:43:20 +0000 (16:43 +0200)]
Declarative: Compile on Windows.

- Remove UTF8 special characters from comments in qsgcontext2d.cpp.

Change-Id: I7ba71f7db72d6d31dec115483ff785a0ce79d0e2
Reviewed-on: http://codereview.qt-project.org/5738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoFix compilation of qmlviewer
Kent Hansen [Thu, 29 Sep 2011 10:09:12 +0000 (12:09 +0200)]
Fix compilation of qmlviewer

"qmlruntime.cpp:123: error: invalid use of incomplete type"
 'const struct QMimeData'"

Change-Id: I427fee401e9fa7cd658c3d01e7530720141e4fa0
Reviewed-on: http://codereview.qt-project.org/5786
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoSeparate the QtQuick 1 and 2 whatsnew docs.
Martin Jones [Wed, 28 Sep 2011 08:25:16 +0000 (18:25 +1000)]
Separate the QtQuick 1 and 2 whatsnew docs.

Change-Id: Ifb2d2604dff3a19ba03f5e8d82cd0dd8b6d8744a
Reviewed-on: http://codereview.qt-project.org/5688
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFix compile of the non-threaded V4 interpreter.
Roberto Raggi [Wed, 28 Sep 2011 13:27:48 +0000 (15:27 +0200)]
Fix compile of the non-threaded V4 interpreter.

Change-Id: I263e9826c513f8edaaf510ff1206b588dfe92f7b
Reviewed-on: http://codereview.qt-project.org/5725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix TextInput and TextEdit inputMethodComposing autotests
Joona Petrell [Wed, 28 Sep 2011 14:47:19 +0000 (17:47 +0300)]
Fix TextInput and TextEdit inputMethodComposing autotests

In old QInputContext architecture events were send to focus
widget, which delivered the events to the text editor items.
In Qt5, input methods send events directly to the editor
object using QInputPanel::inputItem().

Task-number: QTBUG-21691

Change-Id: Ia219f0cc7caaeafc32f5d7674a6ab377e773d4fa
Reviewed-on: http://codereview.qt-project.org/5741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix TextInput and TextEdit openInputPanel autotests
Joona Petrell [Wed, 28 Sep 2011 13:56:36 +0000 (16:56 +0300)]
Fix TextInput and TextEdit openInputPanel autotests

Task-number: QTBUG-21691

The change also removes showInputPanelOnClick code from the TextInput and
TextEdit, which was done to support Symbian^1 and ^3 fullscreen keyboards.
Now by default the keyboard always follows editor focus.

Change-Id: Id60a17fe51b3aa49ba9ea81b985e608e91c26145
Reviewed-on: http://codereview.qt-project.org/5733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQDeclarativeIncubator doc
Aaron Kennedy [Thu, 29 Sep 2011 06:06:27 +0000 (16:06 +1000)]
QDeclarativeIncubator doc

Change-Id: I4fdc9e55112187039dd6210e9bc92b1da183501b
Task-number: QTBUG-21151
Reviewed-on: http://codereview.qt-project.org/5776
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRemove dead code in QDeclarativeSvgParser
Kent Hansen [Wed, 28 Sep 2011 11:45:39 +0000 (13:45 +0200)]
Remove dead code in QDeclarativeSvgParser

'toDouble(const QChar *&str)' is the only one still in use.

Change-Id: I3e5af822a4772f1f11c8ee7011e847963077587d
Reviewed-on: http://codereview.qt-project.org/5717
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agopulse calls should use ms instead of s
Kent Hansen [Thu, 29 Sep 2011 05:17:32 +0000 (07:17 +0200)]
pulse calls should use ms instead of s

This updates the examples to reflect the API change
that was done in commit f0dc82305eb9c9297d73cba67634e9e4bc4f3b84

Change-Id: Id08896cbe3a47adc0b02797faddf50281a24c625
Reviewed-on: http://codereview.qt-project.org/5702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAsynchronous component instantiation
Aaron Kennedy [Mon, 5 Sep 2011 07:31:41 +0000 (17:31 +1000)]
Asynchronous component instantiation

This introduces two main:

    * the QML compiler executes in a separate thread
    * item instantiation can be interrupted and resumed to
      allow it to be split across multiple frames.

Task-number: QTBUG-21151
Change-Id: I9631c62bb77da3a2e0c37f0da3719533fdce4fef
Reviewed-on: http://codereview.qt-project.org/5676
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoBetter dirty marking
Alan Alpert [Fri, 23 Sep 2011 05:52:06 +0000 (15:52 +1000)]
Better dirty marking

Mark geometry as well per frame, and material when it changes.

Change-Id: I67dd68b67f04f2379534b71f3c8a6e367d9d4bd5
Reviewed-on: http://codereview.qt-project.org/5439
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix QSGCustomParticle initialization
Alan Alpert [Fri, 23 Sep 2011 04:59:06 +0000 (14:59 +1000)]
Fix QSGCustomParticle initialization

commit was failing because nodes weren't stored yet, which could lead to
an apparent loss of particles.

Change-Id: Ibde6aa75f6c43e2d485c163820e65e0c6ff8e952
Reviewed-on: http://codereview.qt-project.org/5437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix tst_QSGListView::sectionsPositioning() test
Martin Jones [Wed, 28 Sep 2011 05:55:34 +0000 (15:55 +1000)]
Fix tst_QSGListView::sectionsPositioning() test

Change-Id: Ifdf43d43c4cb6f04798ee7ef93d7fa6dd5589640
Reviewed-on: http://codereview.qt-project.org/5669
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRestructure imageelements and remove screenorientation examples.
Damian Jansen [Thu, 29 Sep 2011 02:35:17 +0000 (12:35 +1000)]
Restructure imageelements and remove screenorientation examples.

Change-Id: Ia23c905baab95f348c967b6769d7190c15eed19a
Reviewed-on: http://codereview.qt-project.org/5765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoAdded triple click on TextInput to select text.
Rafael Brandao [Thu, 29 Sep 2011 00:53:15 +0000 (10:53 +1000)]
Added triple click on TextInput to select text.

Once it gets a double click, it'll start to monitor any other extra
click for a short duration. Once it is detected, the monitor stops
watching and all text is selected. It only works when selectByMouse
property is set, just like double click selecting current word.

Also added a test case that simulates clicking at the same point
and triggering the triple click, and another one that contemplates
movement of mouse between the second and the third click. Also test
timing between clicks.

Task-number: QTBUG-21038

Change-Id: I139f7ece2107f5dbfcba1836afb27aaa9b24fc57
Merge-request: 6
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoCatch up with API change to QTestLog::qWarn().
Jason McDonald [Wed, 28 Sep 2011 08:44:26 +0000 (18:44 +1000)]
Catch up with API change to QTestLog::qWarn().

Change-Id: I2db27f473a0f35530961fa70e35eb552be02e890
Reviewed-on: http://codereview.qt-project.org/5695
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't do run svg tests when no svg is available
Gunnar Sletta [Wed, 28 Sep 2011 08:32:19 +0000 (10:32 +0200)]
Don't do run svg tests when no svg is available

Change-Id: I6625a9e1542ffc962d5b2c414832575e450a9e61
Reviewed-on: http://codereview.qt-project.org/5690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoBuild with qt-in-namespace
Kent Hansen [Wed, 28 Sep 2011 07:57:04 +0000 (09:57 +0200)]
Build with qt-in-namespace

Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a
Reviewed-on: http://codereview.qt-project.org/5693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDon't crash when Image.source change
Gunnar Sletta [Tue, 27 Sep 2011 15:04:03 +0000 (17:04 +0200)]
Don't crash when Image.source change

QDeclarativePixmap::clear() may result in the texture being
scheduled for deletion, so we need to make sure that our texture
provider is updated properly whenever the source changes.

Change-Id: Ie21c6fcba4b0cd438250dc4c263b513060cc026e
Reviewed-on: http://codereview.qt-project.org/5673
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd support for onLinkActivated with Text.StyledText
Yann Bodson [Tue, 27 Sep 2011 02:56:17 +0000 (12:56 +1000)]
Add support for onLinkActivated with Text.StyledText

Change-Id: If7efa09e0e42970c6cb6ca8725713eb4a6f97ac8
Reviewed-by: Michael Brasser
Reviewed-on: http://codereview.qt-project.org/5665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoFix crash in String.arg()
Chris Adams [Mon, 19 Sep 2011 01:00:14 +0000 (11:00 +1000)]
Fix crash in String.arg()

This commit ensures that the String.arg() function works correctly,
by registering an anonymous function with the String Prototype object
which calls the StringArg function, ensuring that the "this" object
is valid (and passing the string as an argument to StringArg instead).

Change-Id: I0a8cbaa12b39beb03a237c3ab62c6e21fafdedbf
Reviewed-on: http://codereview.qt-project.org/4385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoUse QBasicTimer rather than QTimer in SmoothedAnimation
Martin Jones [Wed, 28 Sep 2011 00:12:08 +0000 (10:12 +1000)]
Use QBasicTimer rather than QTimer in SmoothedAnimation

QBasicTimer does the same job for lower cost.

Change-Id: I11d7033b9c456129f3f984c8baafa717f5b25d99
Reviewed-on: http://codereview.qt-project.org/5649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoEnable QSGTextEdit and QSGTextInput failures.
Andrew den Exter [Tue, 27 Sep 2011 05:53:46 +0000 (15:53 +1000)]
Enable QSGTextEdit and QSGTextInput failures.

Fix compilation errors and skip or expect fail any tests that don't
pass.  The following tasks have been created for failing tests:

QTBUG-21686
QTBUG-21689
QTBUG-21690
QTBUG-21691
QTBUG-21693

Change-Id: I3f5bb275e1a207ebdf86e3d523cdeda1f943eb63
Reviewed-on: http://codereview.qt-project.org/5583
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years ago[autotests] Added expected failure for developer build in currentIndex test.
Toby Tomkins [Tue, 27 Sep 2011 03:11:06 +0000 (13:11 +1000)]
[autotests] Added expected failure for developer build in currentIndex test.

Task-number: QTBUG-21682

Change-Id: Icbe3ef45c9c58b54c195993b837713aef1dd3ca2
Reviewed-on: http://codereview.qt-project.org/5571
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years ago[autotest] Abort an unstable test for developer build.
Toby Tomkins [Tue, 27 Sep 2011 04:20:49 +0000 (14:20 +1000)]
[autotest] Abort an unstable test for developer build.

Task-number: QTBUG-21688

Change-Id: I732c6dc8baa7942521cf3b9d4960a3f405d07aa2
Reviewed-on: http://codereview.qt-project.org/5577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years ago[autotests] Added expected failures for developer build in a number of tests.
Toby Tomkins [Tue, 27 Sep 2011 03:42:45 +0000 (13:42 +1000)]
[autotests] Added expected failures for developer build in a number of tests.

Task-number: QTBUG-21683

Change-Id: I0cc6150daed38a8f2207fa848be79e8cc6c56b48
Reviewed-on: http://codereview.qt-project.org/5573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years ago[autotest] Abort an unstable test for developer build.
Toby Tomkins [Tue, 27 Sep 2011 03:57:07 +0000 (13:57 +1000)]
[autotest] Abort an unstable test for developer build.

Task-number: QTBUG-21685

Change-Id: I96abcc88d861ce2c5b8778b56f34d42b58c4eb53
Reviewed-on: http://codereview.qt-project.org/5574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years ago[autotests] Added expected failure for developer build.
Toby Tomkins [Tue, 27 Sep 2011 04:05:33 +0000 (14:05 +1000)]
[autotests] Added expected failure for developer build.

Task-number: QTBUG-21687

Change-Id: I46f8e9c693d0fe3de48ea0f3fd967cc5ca8d1d30
Reviewed-on: http://codereview.qt-project.org/5575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoImproved testdata deployment.
Rohan McGovern [Tue, 27 Sep 2011 05:07:50 +0000 (15:07 +1000)]
Improved testdata deployment.

Don't embed the source path into the binary, instead find the testdata
relative to the test's binary at runtime.

Use DEPLOYMENT hints for installing testdata to a device.

Change-Id: I4005422bb76adf214166fe75d66e82fb18ded04e
Reviewed-on: http://codereview.qt-project.org/5578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoManually apply SnapOneItem/Row changes from Qt 4.7
Martin Jones [Mon, 26 Sep 2011 03:13:02 +0000 (13:13 +1000)]
Manually apply SnapOneItem/Row changes from Qt 4.7

Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items:
cf23188de237009136fa1480ab8fd9e3ca364769
f85819fe083ae7c6804c884de68e906d153a6d11
09cd2f818208a83489fae034b80e6497b7cc83af

Task-number: QTBUG-20683
Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7
Reviewed-on: http://codereview.qt-project.org/5484
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoAdd QSGPaintedItem docs to module and fix non-standard wording.
Casper van Donderen [Wed, 21 Sep 2011 05:13:38 +0000 (07:13 +0200)]
Add QSGPaintedItem docs to module and fix non-standard wording.

Change-Id: I763b1fdabdac36935bd14005a9e38b2494319726
Reviewed-on: http://codereview.qt-project.org/5521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd convenience macro for fast connects in declarative.
Michael Brasser [Thu, 22 Sep 2011 03:14:00 +0000 (13:14 +1000)]
Add convenience macro for fast connects in declarative.

We already follow this pattern several places, so
this commit creates a convenience macro for it, and replaces
previous usage where appropriate. Also adds the macro
several places as further optimization.

Change-Id: Ieff5ed6cc51c34d0a1c8aa42ac40314ea243477a
Reviewed-on: http://codereview.qt-project.org/5342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years ago[autotests] Added expected failure for developer build in currentIndex test.
Toby Tomkins [Tue, 27 Sep 2011 03:02:25 +0000 (13:02 +1000)]
[autotests] Added expected failure for developer build in currentIndex test.

Task-number: QTBUG-21680

Change-Id: Ic33f4f4fc96529e0a3b2be4150829ab62fe078ff
Reviewed-on: http://codereview.qt-project.org/5565
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoPart of bug has re-occurred, relates to x{} behaviour.
Toby Tomkins [Tue, 27 Sep 2011 01:55:27 +0000 (11:55 +1000)]
Part of bug has re-occurred, relates to x{} behaviour.

Task-number: QTBUG-12295

Change-Id: Idcb9ceac1ad0b093e560ef793820a1ea2178c51e
Reviewed-on: http://codereview.qt-project.org/5483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDisable reordering as it is currently broken
Gunnar Sletta [Mon, 26 Sep 2011 08:45:28 +0000 (10:45 +0200)]
Disable reordering as it is currently broken

Change-Id: I28b622422aff62ea988a2918830338736df6fdbe
Reviewed-on: http://codereview.qt-project.org/5528
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoMake surface format plugable from the scene graph plugin
Gunnar Sletta [Fri, 23 Sep 2011 14:24:06 +0000 (16:24 +0200)]
Make surface format plugable from the scene graph plugin

Also enable depth, stencil and samples by default as our default
renderer requires both depth and stencil and our default rounded
rectangles require multisampling

The user should be able to override the default format, by getting
the QSGCanvas::format(), modify it and set it back, but this
is currently not supported in QWindow, so that will have to wait

Change-Id: I1869003705709987ab2e9a3cebbeeec4d45a2021
Reviewed-on: http://codereview.qt-project.org/5464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>