profile/ivi/qtdeclarative.git
12 years agoRemove insignificant flag for passing tests.
Toby Tomkins [Tue, 11 Oct 2011 23:49:53 +0000 (09:49 +1000)]
Remove insignificant flag for passing tests.

Change-Id: Ic8c5e7871b240572b882825c91e0a544856da687
Reviewed-on: http://codereview.qt-project.org/6384
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agofix crash bug when unloading canvas
Charles Yin [Tue, 11 Oct 2011 01:37:49 +0000 (11:37 +1000)]
fix crash bug when unloading canvas

Task-number:QTBUG-21935
Change-Id: If4a2a92b2f53cf81a48d023df8a1e6d11e522e0d
Reviewed-on: http://codereview.qt-project.org/6370
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agofix several canvasitem bugs
Charles Yin [Tue, 11 Oct 2011 06:23:50 +0000 (16:23 +1000)]
fix several canvasitem bugs

Change-Id: I6a6d97253fe66184736f8ac089e97aa114f0e83a
Reviewed-on: http://codereview.qt-project.org/6405
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoAllow view items to be preserved.
Andrew den Exter [Wed, 28 Sep 2011 23:58:42 +0000 (09:58 +1000)]
Allow view items to be preserved.

Do not destroy items that are members of the VisualDataModel
persistedItems group when they are released by the view.

The create function on VisualDataGroup will return a reference to
an instantiated item within that group, any item returned by this
function is automatically added to the persistedItems group and can
be released by removing it from the group.  Uninstantiated items added
to the persistedItems group by any other means are not instantiated
until requested by a view or create.

Task-number: QTBUG-21518
Task-number: QTBUG-20854

Change-Id: I59554711208504c8f20a3ebe783bddab9b21a558
Reviewed-on: http://codereview.qt-project.org/5831
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoRemove aggregated heap snapshots
Aaron Kennedy [Tue, 11 Oct 2011 00:51:06 +0000 (10:51 +1000)]
Remove aggregated heap snapshots

Newer versions of v8 only support full snapshots.

Change-Id: I2c6778579bdb2ec1cc38868bf4fa76ce3fbc1633
Reviewed-on: http://codereview.qt-project.org/6406
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoOptimize signal handling
Aaron Kennedy [Mon, 10 Oct 2011 03:52:34 +0000 (13:52 +1000)]
Optimize signal handling

Bindings connect to lots of signals that are never emitted.  By managing
signal connection lists ourselves, we can do a much better job than Qt's
generic signal/slot connection logic.

Also, by connecting to QDeclarativeNotifierEndpoint's rather than QObject
slots, we can eliminate the need to instantiate a QObject for the V4 and
V8 binding managers.

Change-Id: I598667deaefdbd2860227bd74378a1b196761686
Reviewed-on: http://codereview.qt-project.org/6278
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>

12 years agoComponent.incubateObject() autotest
Aaron Kennedy [Fri, 7 Oct 2011 03:16:47 +0000 (13:16 +1000)]
Component.incubateObject() autotest

Change-Id: I37f76d5b273ae4f032c4de5ac8fcbff4204b78fe
Reviewed-on: http://codereview.qt-project.org/6200
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>

12 years agoImprovements to text layouting in QML
Yann Bodson [Thu, 22 Sep 2011 01:34:58 +0000 (11:34 +1000)]
Improvements to text layouting in QML

Allow more control over the text layouting process in QML.

Give access to every text line through a hook, this gives the
opportunity to position and resize a line as it is being laid out.
It is then possible to lay out the text in columns or around other
objects.

Task-number: QTBUG-21367
Change-Id: I56dc0c1c4b575dc06360c135098024d0324d3656
Reviewed-on: http://codereview.qt-project.org/5351
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Sanity-Review: Yann Bodson <yann.bodson@nokia.com>

12 years agoQmlProfiler: send end of trace event
Christiaan Janssen [Fri, 7 Oct 2011 15:35:53 +0000 (17:35 +0200)]
QmlProfiler: send end of trace event

Change-Id: I2e857028bde15145d5d01c6f5325a4ceabb37e27
Reviewed-on: http://codereview.qt-project.org/6434
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoMore accurate timing for rendering thread
Jiang Jiang [Tue, 11 Oct 2011 09:10:41 +0000 (11:10 +0200)]
More accurate timing for rendering thread

To get a better overview of how much time we consumed rendering
each frame, setting QElapsedTimer around each loop in the rendering
thread. It can be turned on with QML_CANVAS_TIMING=1 environment
variable.

Change-Id: I81a231983e5f7d898589d5fe18782dd5c7e8e0dc
Reviewed-on: http://codereview.qt-project.org/6420
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoQmlProfiler: tracking animations
Christiaan Janssen [Fri, 7 Oct 2011 12:51:07 +0000 (14:51 +0200)]
QmlProfiler: tracking animations

Change-Id: I78fa5ed5385dfe1715c9d05a5e63eb7185870e61
Reviewed-on: http://codereview.qt-project.org/6254
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoQInputPanel exposed as a property from QDeclarativeApplication
Sami Kananoja [Wed, 28 Sep 2011 08:16:51 +0000 (11:16 +0300)]
QInputPanel exposed as a property from QDeclarativeApplication

Task-number: QTBUG-21449

Change-Id: I437f80f4d1f0dbb3cb410940213eae50a4cef2cd
Reviewed-on: http://codereview.qt-project.org/5852
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agotests: eliminated usage of qttest_p4.prf
Rohan McGovern [Tue, 11 Oct 2011 05:14:05 +0000 (15:14 +1000)]
tests: eliminated usage of qttest_p4.prf

qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Since QT+= had to be touched already, this change also removes a lot of
useless duplication on those lines.

Change-Id: I9f2f20eaf4a0e676beddf474c7db8680e4712f78
Reviewed-on: http://codereview.qt-project.org/6302
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove insignificant test status and explicitly mark failing test.
Toby Tomkins [Tue, 11 Oct 2011 03:12:23 +0000 (13:12 +1000)]
Remove insignificant test status and explicitly mark failing test.

Task-number: QTBUG-21946

Change-Id: Idf54ad4811562634b792f973c9f1a518a09e5a4d
Reviewed-on: http://codereview.qt-project.org/6375
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix layout issues with recently removed items.
Andrew den Exter [Mon, 10 Oct 2011 00:37:31 +0000 (10:37 +1000)]
Fix layout issues with recently removed items.

Items removed from the source model aren't removed from the cache
group until they've also been released by the view.  Skip over
these removed items when translating future changes to the source
model so no invalid translated changes are created.

Change-Id: I9bf3801135e78b5a6493b4ef50ce44ee5c912bfc
Reviewed-on: http://codereview.qt-project.org/6298
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agofix canvas bug
Charles Yin [Tue, 11 Oct 2011 04:28:28 +0000 (14:28 +1000)]
fix canvas bug

do painting only after component loaded and paint after geometry size initialized

Task-number:QTBUG-21920
Task-number:QTBUG-21918
Change-Id: Ibbc12d416dc694eff35f16c03cbc3c16e333645b
Reviewed-on: http://codereview.qt-project.org/6387
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoExpand QSGImageParticle test
Alan Alpert [Mon, 10 Oct 2011 09:05:51 +0000 (19:05 +1000)]
Expand QSGImageParticle test

Now tests all performance levels.

Also fixes an emitter timing edge-case which might be destabilizing the
tests.

Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66b
Reviewed-on: http://codereview.qt-project.org/6313
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDocumentation Augmentation
Alan Alpert [Mon, 10 Oct 2011 09:22:24 +0000 (19:22 +1000)]
Documentation Augmentation

The performance implications of adding an affector should be mentioned.

Change-Id: I0d508b0dfd16a7e9a56bf5f3c7797d1f4dd6a609
Reviewed-on: http://codereview.qt-project.org/6314
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoStabilize Particles tests
Alan Alpert [Mon, 10 Oct 2011 08:02:17 +0000 (18:02 +1000)]
Stabilize Particles tests

One potential problem is that in certain circumstances the recycling
data list is so efficient that it doesn't need to use all particle data
in the list. In those cases, the uninitialized members were causing test
failures but these slight differences are acceptable for the simulation.

The ParticleSystem test is extended to check that it's only small edge
cases.

Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66a
Reviewed-on: http://codereview.qt-project.org/6312
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoInitialize new particle data members
Alan Alpert [Mon, 10 Oct 2011 08:30:41 +0000 (18:30 +1000)]
Initialize new particle data members

Change-Id: I1ba5aac70e662d64f9007a18465f520c8912ecf6
Reviewed-on: http://codereview.qt-project.org/6309
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoWe no longer depend on qtsvg
Alan Alpert [Fri, 7 Oct 2011 05:23:08 +0000 (15:23 +1000)]
We no longer depend on qtsvg

Change-Id: I5980634dd4f234d9b7d0bed56c4f4cab9459fb37
Reviewed-on: http://codereview.qt-project.org/6209
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoGeneric solution for finding QtDeclarative test data.
Michael Brasser [Fri, 7 Oct 2011 03:19:13 +0000 (13:19 +1000)]
Generic solution for finding QtDeclarative test data.

Also implemented changes for qsgrepeater test to verify.

Task-number: QTBUG-21721
Change-Id: Ia5a839d1a23ba0f6ee144450ec026b74ee72134b
Reviewed-on: http://codereview.qt-project.org/6203
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse QBasicAtomicInt load() and store() instead of implicit casting
Bradley T. Hughes [Mon, 10 Oct 2011 14:27:10 +0000 (16:27 +0200)]
Use QBasicAtomicInt load() and store() instead of implicit casting

The implicit casts will be unavailable in the near future.

This is a follow up to commit 7f8472af8c03296be9e9ce50d8e9b3089eedf2f1,
which didn't catch all usages of the implicit cast and assignment
operator.

Change-Id: If05c343e2851b41e4a351c56328c4406c688fa0d
Reviewed-on: http://codereview.qt-project.org/6351
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoUpdate SpriteImage to modern standards
Alan Alpert [Mon, 10 Oct 2011 07:12:06 +0000 (17:12 +1000)]
Update SpriteImage to modern standards

Includes updating shaders to contain the recent size flexibilities
added to QSGImageParticle, adding documentation, moving shaders
into the source file, and optional interpolation.

Small doc fixes, moving shaders into the source file, and moving the
resources (because there are no longer any shaders there) were applied
to ImageParticle and Turbulence (last user of particles resources).

Change-Id: I5e2f133dc4b96dd05d49e7e983ae630e379fa66f
Reviewed-on: http://codereview.qt-project.org/6303
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoUse QBasicAtomicInt load() and store() instead of implicit casting
Bradley T. Hughes [Mon, 3 Oct 2011 08:50:45 +0000 (10:50 +0200)]
Use QBasicAtomicInt load() and store() instead of implicit casting

The implicit casts will be unavailable in the near future

Change-Id: Ieab3603e500d3621e65f96d970c9935be7f3aa52
Reviewed-on: http://codereview.qt-project.org/6229
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdd "asynchronous" property to Loader.
Martin Jones [Fri, 7 Oct 2011 06:20:39 +0000 (16:20 +1000)]
Add "asynchronous" property to Loader.

Use an incubator to perform non-blocking instantiation of components.

Change-Id: I589bfc8ba7bf3368dc44fab3a82afb7e0d66032c
Fixes: QTBUG-21791
Reviewed-on: http://codereview.qt-project.org/6216
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoCompile
Aaron Kennedy [Mon, 10 Oct 2011 05:34:05 +0000 (15:34 +1000)]
Compile

Change-Id: I80763db7108990b121de085b8c33cb90382b6cd1
Reviewed-on: http://codereview.qt-project.org/6292
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoDon't skip over the majority of the GridView tests.
Andrew den Exter [Mon, 10 Oct 2011 06:05:21 +0000 (16:05 +1000)]
Don't skip over the majority of the GridView tests.

Change-Id: Ie8768120c39451facbdb380668302fc645a06682
Reviewed-on: http://codereview.qt-project.org/6299
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoAdd DropArea item and Drag attached property.
Andrew den Exter [Mon, 12 Sep 2011 04:17:08 +0000 (14:17 +1000)]
Add DropArea item and Drag attached property.

Refactors drag API to improve compatibility with traditional drag and
drop by reusing events and adding drop actions.

Event sending is removed from MouseArea, instead the Drag object can
be attached to the item that is dragged and it will send drag events
when the position of that item is changed or when its active
property changes.

The DragTarget item is renamed to DropArea and can now communicate
supported and suggested actions.

Task-number: QTBUG-19747
Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c
Reviewed-on: http://codereview.qt-project.org/4638
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDocumentation Augmentation
Alan Alpert [Fri, 7 Oct 2011 01:27:15 +0000 (11:27 +1000)]
Documentation Augmentation

The property name changed, the docs should change too

Change-Id: Idcdb9eaf570a7189da1ea00c9482fd1f72371906
Reviewed-on: http://codereview.qt-project.org/6189
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agomake it possible to run single qml test case file by passing a tst_*.qml file to...
Charles Yin [Mon, 10 Oct 2011 01:30:15 +0000 (11:30 +1000)]
make it possible to run single qml test case file by passing a tst_*.qml file to -input option

Change-Id: I8376ca0ae23d4366d69e0e7f3c95593ba54fc71d
Reviewed-on: http://codereview.qt-project.org/6273
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoFix crashes caused by handle management in worker threads
Chris Adams [Fri, 7 Oct 2011 00:01:40 +0000 (10:01 +1000)]
Fix crashes caused by handle management in worker threads

Previously, the QV8Engine destructor and the QV8Engine's QV8GCCallback
Referencer destructor would crash if run after the v8 isolate had been
exited and disposed.  This commit Q_ASSERTs if the worker thread
attempts to do so, and adds a cleanup function which worker threads
should call just prior to exiting the isolate.

Task-number: QTBUG-21866
Change-Id: I379b02e24ad9378e4bfc270fb9208715b6f7b60a
Reviewed-on: http://codereview.qt-project.org/6202
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agofix doc errors
Charles Yin [Mon, 10 Oct 2011 03:43:51 +0000 (13:43 +1000)]
fix doc errors

Change-Id: Ic092f2b2fba5d13eabbca8c599316e5f51193175
Reviewed-on: http://codereview.qt-project.org/6277
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoenable multisampling when paint on FBO with smooth = true
Charles Yin [Mon, 10 Oct 2011 01:11:04 +0000 (11:11 +1000)]
enable multisampling when paint on FBO with smooth = true

Task-number:QTBUG-21916

Change-Id: I7ff9810fbae30a7b765e1624293531204fc319fb
Reviewed-on: http://codereview.qt-project.org/6271
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoDebugger: Fix lock when profiling
Kai Koehne [Thu, 6 Oct 2011 14:33:47 +0000 (16:33 +0200)]
Debugger: Fix lock when profiling

Parts of the loading of data is now in a separate thread, which was already
trying to log trace data while the QDeclarativeDebugTrace constructor
was still blocking. Avoid this by calling QDeclarativeDebugTrace constructor
before the actual execution begins (addEngine()). Also make sure that the
logging methods are reentrant with a mutex.

Change-Id: I5c2c1d14763fd9c7cb6fc93c6dff22d00d8737f1
Reviewed-on: http://codereview.qt-project.org/6169
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoDebugger: Warn if we receive corrupted packets
Kai Koehne [Thu, 6 Oct 2011 14:37:48 +0000 (16:37 +0200)]
Debugger: Warn if we receive corrupted packets

Change-Id: Ie99e6806203d5c36dc8d3eb7778a04562c4d6871
Reviewed-on: http://codereview.qt-project.org/6170
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoRemove redundant checks in qdeclarativestategroup
Kent Hansen [Wed, 5 Oct 2011 10:43:32 +0000 (12:43 +0200)]
Remove redundant checks in qdeclarativestategroup

Checking once should be enough for everyone.

Task-number: QTBUG-20482
Change-Id: I6cc1c608d9c1da0f4f745e436b9611937a8db160
Reviewed-on: http://codereview.qt-project.org/6054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoMake qmlmin use QmlDevTools library for QML parsing
Kent Hansen [Thu, 6 Oct 2011 09:21:39 +0000 (11:21 +0200)]
Make qmlmin use QmlDevTools library for QML parsing

Needed to make it link in non-developer builds.

Change-Id: I45f413df5e4c01760aa245463c809c5b502a96c2
Reviewed-on: http://codereview.qt-project.org/6130
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoSay hello to QtQmlDevTools library
Kent Hansen [Fri, 23 Sep 2011 08:08:30 +0000 (10:08 +0200)]
Say hello to QtQmlDevTools library

QtQmlDevTools is a private helper library. It provides QML/JS
file parsing for tools that live outside of the qtdeclarative
repository, such as lupdate.

This allows us to remove qttools's dependency on the
qtdeclarative sources.

To use the library:

QT += qmldevtools-private

 #include <private/qdeclarativejsparser_p.h>

Change-Id: Ia43751b9be3d9fe05da03e65c6aca1cd9e3fdbbc
Reviewed-on: http://codereview.qt-project.org/6116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix possible crash with an empty handle
Aaron Kennedy [Fri, 7 Oct 2011 04:14:27 +0000 (14:14 +1000)]
Fix possible crash with an empty handle

Change-Id: I729c919692c65c0ab4272368b7c98101ef573545
Reviewed-on: http://codereview.qt-project.org/6204
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoFix ListView components being unable to access context properties.
Andrew den Exter [Fri, 7 Oct 2011 03:06:26 +0000 (13:06 +1000)]
Fix ListView components being unable to access context properties.

Where avaialable use the components creation context instead of the
views context as the root context for the new item.

Task-number: QTBUG-21865
Change-Id: I07e564548de57d58413dc0d7cd151bd8a90886e7
Reviewed-on: http://codereview.qt-project.org/6199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoQDeclarativeIncubator autotests
Aaron Kennedy [Thu, 6 Oct 2011 07:33:39 +0000 (17:33 +1000)]
QDeclarativeIncubator autotests

Change-Id: I5c4594c40fccfe6cb8b198a5fd6c11b468b0562e
Reviewed-on: http://codereview.qt-project.org/6118
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agomake qmlmin happy with '\0' in string
Charles Yin [Thu, 6 Oct 2011 00:28:25 +0000 (10:28 +1000)]
make qmlmin happy with '\0' in string

Change-Id: Ib14e2d75ea83d71c7422eb3f9560e54095300fb9
Reviewed-on: http://codereview.qt-project.org/6089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix waiting for active window breakage
Martin Jones [Thu, 6 Oct 2011 00:10:24 +0000 (10:10 +1000)]
Fix waiting for active window breakage

Use QTRY_COMPARE(view == qGuiApp->focusWindow());

Change-Id: If5934f4355d9eb8da343f98277e3528f56926cd9
Fixes: QTBUG-21682, QTBUG-21683, QTBUG-21687, QTBUG-21680
Reviewed-on: http://codereview.qt-project.org/6087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix v8 handle management in QSGLoader
Chris Adams [Thu, 6 Oct 2011 06:29:52 +0000 (16:29 +1000)]
Fix v8 handle management in QSGLoader

Previously, setting the source to a remote url and specified some
initial property values while active was false, and then setting
active to true, would cause undefined behaviour.

This commit ensures that the handles are managed correctly, and that
an appropriate v8 context exists during object creation with initial
property values specified.

Task-number: QTBUG-21868
Change-Id: I101c6546537aa05aaeb420195aca670bc71f31e1
Reviewed-on: http://codereview.qt-project.org/6109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDebugger: Call removeEngine also for QV8DebugService
Kai Koehne [Thu, 6 Oct 2011 14:39:38 +0000 (16:39 +0200)]
Debugger: Call removeEngine also for QV8DebugService

Change-Id: Ibb35e577f8844b47a844864f7639321859e20866
Reviewed-on: http://codereview.qt-project.org/6171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoFix missing inline images
Eskil Abrahamsen Blomfeldt [Wed, 5 Oct 2011 14:27:14 +0000 (16:27 +0200)]
Fix missing inline images

Oops, the change to support floating images caused
a regression, as it caused all images represented by object
replacement characters to be ignored instead of only the ones
that were floating and were handled elsewhere. The correct
test is less strict, only verifying that the layout position is
InFlow.

Change-Id: Ib28ea595b598bbd047eebe1a704211f0ba139382
Reviewed-on: http://codereview.qt-project.org/6074
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoQV8Profiler service
Christiaan Janssen [Tue, 27 Sep 2011 13:38:08 +0000 (15:38 +0200)]
QV8Profiler service

Expose the v8 profiler API through the declarative debugging
infrastructure. The client side is implemented in Qt Creator.

Change-Id: Idf4f3338d2e6756e7774f0704c0e5c4b35b0ed35
Reviewed-on: http://codereview.qt-project.org/5893
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoqmlplugindump: Don't dump implicit signals.
Christian Kamm [Thu, 6 Oct 2011 10:12:34 +0000 (12:12 +0200)]
qmlplugindump: Don't dump implicit signals.

Every property automatically has a xyzChanged signal anyway.

Change-Id: I470875a94792c0fc5a6378c8be1e0eddc24a1d5a
Reviewed-on: http://codereview.qt-project.org/6144
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoqmlplugindump: Explicitly add QSGMouseEvent to be dumped.
Christian Kamm [Thu, 6 Oct 2011 10:02:56 +0000 (12:02 +0200)]
qmlplugindump: Explicitly add QSGMouseEvent to be dumped.

Change-Id: I93f29f151e82a3d47fb10ff587fe28ea27a2d7b4
Reviewed-on: http://codereview.qt-project.org/6143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix QJSEngine::newQObject ownership behaviour
Simon Hausmann [Fri, 29 Jul 2011 14:04:26 +0000 (16:04 +0200)]
Fix QJSEngine::newQObject ownership behaviour

Ensure the indestructible flag is set to false for objects wrapped through
QJSEngine::newQObject, to ensure that they get deleted upon gc when they
don't have a parent.

Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified
this behaviour.

Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e
Reviewed-on: http://codereview.qt-project.org/2398
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoAdd a get function to VisualDataGroup.
Andrew den Exter [Fri, 23 Sep 2011 03:43:24 +0000 (13:43 +1000)]
Add a get function to VisualDataGroup.

This returns an object with properties for accessing the model data of
an item, membership in the visual data model's groups and the index
of the item in each group.

Task-number: QTBUG-21512

Change-Id: I878442c8a2e30cc6f9941f7412303581613a6142
Reviewed-on: http://codereview.qt-project.org/5515
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoEnsure view delegates are object parented to the contentItem
Martin Jones [Thu, 6 Oct 2011 06:52:47 +0000 (16:52 +1000)]
Ensure view delegates are object parented to the contentItem

Caused a leak which resulted in persistent v8 handles not being
disposed.

Change-Id: I5c10ff619531976ab61d9ce1ff8327c4a40cfd5e
Reviewed-on: http://codereview.qt-project.org/6112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoFix for qsgtext autotests
Yann Bodson [Thu, 6 Oct 2011 06:45:49 +0000 (16:45 +1000)]
Fix for qsgtext autotests

Change-Id: If02d4cb69b4f729b85b47222c17a0b1642e649fb
Reviewed-on: http://codereview.qt-project.org/6111
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDon't call componentComplete() on a VDM until its view is complete.
Andrew den Exter [Wed, 5 Oct 2011 06:03:12 +0000 (16:03 +1000)]
Don't call componentComplete() on a VDM until its view is complete.

This is more consistent with the behaviour you get when constructing
a VisualDataModel explicitly.

Change-Id: I33e32c7747ff3153449a88b9c7d894807e7e4b9a
Reviewed-on: http://codereview.qt-project.org/6014
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd Particles basic acceptance manual tests.
Damian Jansen [Mon, 3 Oct 2011 02:53:17 +0000 (12:53 +1000)]
Add Particles basic acceptance manual tests.

Change-Id: I9be3f3257d74e6a3535f8137083e5dad31965c87
Reviewed-on: http://codereview.qt-project.org/5906
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoadd canvas drawImage unit tests
Charles Yin [Thu, 6 Oct 2011 04:08:37 +0000 (14:08 +1000)]
add canvas drawImage unit tests

Change-Id: I772bf58bead4b536cc632983846743e0d576bedd
Reviewed-on: http://codereview.qt-project.org/6100
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoQSGLoader shouldn't load component when active is false
Chris Adams [Thu, 6 Oct 2011 04:37:09 +0000 (14:37 +1000)]
QSGLoader shouldn't load component when active is false

Previously, QSGLoader still loaded the component specified, but didn't
instantiate the item. This commit ensures that no component is loaded
from the source, and that the onLoaded signal is emitted only when
loading occurs (when the loader is active).

Task-number: QTBUG-21710
Change-Id: I2d83603ef84d6942fb84141e9e146d2cf9654fc4
Reviewed-on: http://codereview.qt-project.org/5915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDisable particle system tests for CI
Alan Alpert [Thu, 6 Oct 2011 05:47:47 +0000 (15:47 +1000)]
Disable particle system tests for CI

Particle System tests appear to be unstable when run in CI. They should
not have their results counted until this issue is resolved.

Task-number: QTBUG-21867

Change-Id: Ib6a7cd6a48f96bdb1558a1061e0952f583bbcd91
Reviewed-on: http://codereview.qt-project.org/6106
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAllow incubators to be driven recursively
Aaron Kennedy [Thu, 6 Oct 2011 04:14:40 +0000 (14:14 +1000)]
Allow incubators to be driven recursively

Change-Id: If8ce239372c3cf3166b666329ba812b25ee54669
Reviewed-on: http://codereview.qt-project.org/6102
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAlways delete object if incubator is cancelled
Aaron Kennedy [Wed, 5 Oct 2011 08:15:03 +0000 (18:15 +1000)]
Always delete object if incubator is cancelled

Change-Id: Iad04340bac9d1345069e540e6bf9dbf671ce9226
Reviewed-on: http://codereview.qt-project.org/6088
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoMark failing tests as insignificant.
Toby Tomkins [Thu, 6 Oct 2011 02:15:06 +0000 (12:15 +1000)]
Mark failing tests as insignificant.

Change-Id: I105d94624d5c14a54375f59cf48955ea99553f86
Reviewed-on: http://codereview.qt-project.org/6095
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAdd JavaScript "var" property type to QML
Chris Adams [Fri, 30 Sep 2011 01:14:10 +0000 (11:14 +1000)]
Add JavaScript "var" property type to QML

This commit adds a new syntax which allows "var" type properties
which can have JavaScript objects (as well as other basic types)
assigned to them. Such JavaScript objects cannot be bound to.

Task-number: QMLNG-18
Change-Id: If7f5045f4669e0d5c1b8d0891ed765128d0bc1c6
Reviewed-on: http://codereview.qt-project.org/1466
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd support for filtering VisualDataModels.
Andrew den Exter [Thu, 1 Sep 2011 08:06:11 +0000 (18:06 +1000)]
Add support for filtering VisualDataModels.

Add a VisualDataGroup element which items within a VisualDataModel
can be assigned to. Setting the group property of a VisualDataModel
or one of its parts models will filter the items visible within a
view to just items belonging to that group.  By default all items
belong to an 'items' group.

The VisualDataModel attached object includes properties indicating
whether a item is a member of a group and its index in the group.

Task-number: QTBUG-21513 QTBUG-21515
Change-Id: If3df6a359a888a6f79923775d2f78076d5e7d2cf
Reviewed-on: http://codereview.qt-project.org/4115
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd more unit tests for qsgcanvasitem and fix unstable tests
Charles Yin [Tue, 4 Oct 2011 07:12:12 +0000 (17:12 +1000)]
Add more unit tests for qsgcanvasitem and fix unstable tests

Change-Id:I5fc11a5874d55ad423dc1fb9c3e1b75a38003465
Reviewed-on: http://codereview.qt-project.org/5962
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoFix TextInput and TextEdit cursorRectangleSize autotests
Joona Petrell [Fri, 30 Sep 2011 10:37:51 +0000 (13:37 +0300)]
Fix TextInput and TextEdit cursorRectangleSize autotests

Task-number: QTBUG-21691

Change-Id: I7fdcbcb0fd8b3442f5af91aa87f4337c7597f95b
Reviewed-on: http://codereview.qt-project.org/5865
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoDon't overwrite block formats in QSGText
Eskil Abrahamsen Blomfeldt [Wed, 5 Oct 2011 11:50:07 +0000 (13:50 +0200)]
Don't overwrite block formats in QSGText

When QSGText has rich text, we need to retain the block formats
already in the document instead of overwriting them. E.g. lists
would not work because of this bug.

Change-Id: I4cdae55e2358950a330c61613b5fd41e1986dc13
Reviewed-on: http://codereview.qt-project.org/6059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoDon't accidentally use atlas images in particle nodes
Gunnar Sletta [Wed, 5 Oct 2011 10:51:38 +0000 (12:51 +0200)]
Don't accidentally use atlas images in particle nodes

Change-Id: I3058d9262bbc32c873ba26e51b04668f89ed060a
Reviewed-on: http://codereview.qt-project.org/6039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
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>