profile/ivi/qtdeclarative.git
12 years agoDebug Service: Synchronize with v8 debug client.
Aurindam Jana [Mon, 22 Aug 2011 10:54:26 +0000 (12:54 +0200)]
Debug Service: Synchronize with v8 debug client.

In "blocking" mode, the service waits till the client has
sent all initialization data.

Change-Id: Ia62ac46527911bc9c648abd6930cb6ea1474718b
Reviewed-on: http://codereview.qt.nokia.com/3306
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoSlightly reduce distance-field texture creation (and resizing) time.
Yoann Lopes [Wed, 24 Aug 2011 09:48:57 +0000 (11:48 +0200)]
Slightly reduce distance-field texture creation (and resizing) time.

Pass a null pointer to glTexImage2D instead of a zero-filled array.

Change-Id: I8428b26a83a3f88ad2ee07e56e5cdb09ee5de68a
Reviewed-on: http://codereview.qt.nokia.com/3492
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoFixed QSGPaintedItem updates when a contentsScale is set.
Yoann Lopes [Thu, 18 Aug 2011 13:38:25 +0000 (15:38 +0200)]
Fixed QSGPaintedItem updates when a contentsScale is set.

Change-Id: Iee9cd4503bcfdce39b6ee4beaccfed7da45cb8bc
Reviewed-on: http://codereview.qt.nokia.com/3192
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoDeclarativeDebug: Clear service name when returning from waitForMessage
Aurindam Jana [Wed, 24 Aug 2011 10:13:39 +0000 (12:13 +0200)]
DeclarativeDebug: Clear service name when returning from waitForMessage

The service name is cleared in waitForMessage instead of receiveMessage
so that consequent packets can de delivered to the service. A flag is
used to check if the operation succeeded.

Change-Id: I45b94a6194026d22ffb75a394628c7497ce4704e
Reviewed-on: http://codereview.qt.nokia.com/3486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoAbsorb CustomEmitter/Affector
Alan Alpert [Tue, 23 Aug 2011 10:03:43 +0000 (20:03 +1000)]
Absorb CustomEmitter/Affector

The signal is now on the Emitter/Affector base type, but only
emitted if connected to (to save creating the v8 object)

Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e
Reviewed-on: http://codereview.qt.nokia.com/3393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoLift particle limits on desktop
Alan Alpert [Tue, 23 Aug 2011 03:08:08 +0000 (13:08 +1000)]
Lift particle limits on desktop

Change-Id: I65d897273cd0e3a2ea58c78b0cde08a388506f84
Reviewed-on: http://codereview.qt.nokia.com/3355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSwitch from textures to uniform arrays for size/opacity tables
Alan Alpert [Tue, 23 Aug 2011 08:20:58 +0000 (18:20 +1000)]
Switch from textures to uniform arrays for size/opacity tables

Change-Id: Iafc5eaa80f68345cc3b14fe0b2d997c1af435419
Reviewed-on: http://codereview.qt.nokia.com/3388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix tst_qjsvalue::castToPointer test failure
Kent Hansen [Mon, 22 Aug 2011 11:15:52 +0000 (13:15 +0200)]
Fix tst_qjsvalue::castToPointer test failure

In order for casting the variant's data() to work,
we need to get at the actual QVariant wrapped in
the JS object; copying the variant caused a stale
pointer to be returned.

Task-number: QTBUG-21000
Change-Id: I1a32a70d5a043c94dbbd07ef2c8048e7df7fc7bf
Reviewed-on: http://codereview.qt.nokia.com/3309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agomapFromModel() returned incorrect value
Bea Lam [Wed, 24 Aug 2011 06:47:35 +0000 (16:47 +1000)]
mapFromModel() returned incorrect value

It should not add visibleIndex to the returned value.
(regression from 9b5f9c8056186c9cf3c40dbac66e5f90369339dc when ListView
and GridView implementations were merged). GridView used to do this and
so did ListView at one point but the ListView implementation was
changed.

Change-Id: I94c02034580506d4b431126f1b857977e401c27a
Reviewed-on: http://codereview.qt.nokia.com/3450
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoreenable tst_examples
Alan Alpert [Wed, 24 Aug 2011 04:55:59 +0000 (14:55 +1000)]
reenable tst_examples

A potential culprit has been disabled pending investigation, testing may
proceed as normal.

Change-Id: I471d768e033b1e3fea1714983056ca4631baabd8
Reviewed-on: http://codereview.qt.nokia.com/3444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agodisable the canvas svgpath example temporarily.
Charles Yin [Wed, 24 Aug 2011 04:49:07 +0000 (14:49 +1000)]
disable the canvas svgpath example temporarily.

Change-Id: I368acd65e9d352ecc04f4f7aaa3efc43d4530530
Reviewed-on: http://codereview.qt.nokia.com/3440
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoDo not deliver mouse wheel events when item is not visible
Caio Marcelo de Oliveira Filho [Tue, 23 Aug 2011 22:04:16 +0000 (19:04 -0300)]
Do not deliver mouse wheel events when item is not visible

This patch change the code to also skip invisible items (it was
done for disabled already) when deciding whether or not deliver the
wheel event to an item. The rationale here is to follow the same
rule as the other mouse events.

An autotest was added to verify and maintain this behavior.

Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f94
Reviewed-on: http://codereview.qt.nokia.com/3429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoCompile on Mac
Alan Alpert [Tue, 23 Aug 2011 08:34:46 +0000 (18:34 +1000)]
Compile on Mac

Change-Id: I4e1deb5a5430af79430e3c1fc22f16461672586d
Reviewed-on: http://codereview.qt.nokia.com/3389
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSwitch to using one shader and #ifdefs
Alan Alpert [Mon, 22 Aug 2011 09:00:16 +0000 (19:00 +1000)]
Switch to using one shader and #ifdefs

Also clean up the shader code a little

Change-Id: I98062ae729c145901e1d218a698672672ca1bf26
Reviewed-on: http://codereview.qt.nokia.com/3298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoInitial entryEffect support for ImageParticle
Alan Alpert [Mon, 22 Aug 2011 01:55:51 +0000 (11:55 +1000)]
Initial entryEffect support for ImageParticle

Implementation for tabled and above is different, coming in a later
commit.

Change-Id: I7ad16a173521bdcef4ddb68f594be7c942ddb505
Reviewed-on: http://codereview.qt.nokia.com/3280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoUse point sprites
Alan Alpert [Fri, 19 Aug 2011 04:56:19 +0000 (14:56 +1000)]
Use point sprites

Only for the simpler particles, at least for now.

Change-Id: If777cf301894553849b78060aa23980aee7fb807
Reviewed-on: http://codereview.qt.nokia.com/3240
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agotest: marked tst_examples as insignificant_test on x11
Rohan McGovern [Wed, 24 Aug 2011 00:41:06 +0000 (10:41 +1000)]
test: marked tst_examples as insignificant_test on x11

This test sometimes segfaults.

Task-number: QTBUG-21078
Change-Id: I3636063457fd78099fd471a1175bc2151ae178cc
Reviewed-on: http://codereview.qt.nokia.com/3426
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:33 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: Id68d91dcf6c6d980e59aeb97ab9f8a57ffedb7b4
Reviewed-on: http://codereview.qt.nokia.com/3369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd the rest of the tiered shaders to QSGImageParticle
Alan Alpert [Thu, 18 Aug 2011 10:47:23 +0000 (20:47 +1000)]
Add the rest of the tiered shaders to QSGImageParticle

Also simplifies the use of multiple shaders.

Change-Id: Ib4e16406865407626e4e736e7daeba4855dc0574
Reviewed-on: http://codereview.qt.nokia.com/3174
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAdd console debugging for particles
Alan Alpert [Thu, 18 Aug 2011 06:01:58 +0000 (16:01 +1000)]
Add console debugging for particles

Enable with the environment variable QML_PARTICLES_DEBUG.

Change-Id: I8aee2702e17f4ec6d18d8def9d57c5238d4c28ae
Reviewed-on: http://codereview.qt.nokia.com/3136
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agotest: marked expected failure in tst_qsgtextinput
Rohan McGovern [Tue, 23 Aug 2011 00:33:58 +0000 (10:33 +1000)]
test: marked expected failure in tst_qsgtextinput

Part of this test was already marked as an expected failure.
Now it fails in a different place.

Task-number: QTBUG-21011
Change-Id: I15ce8be882b361fda8351900eb768acec01a7bac
Reviewed-on: http://codereview.qt.nokia.com/3343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agotest: marked tst_qsgfocusscope as insignificant
Rohan McGovern [Mon, 22 Aug 2011 23:57:58 +0000 (09:57 +1000)]
test: marked tst_qsgfocusscope as insignificant

This autotest is unstable.

Task-number: QTBUG-21054
Change-Id: Ifeea19a842ccca9b086117345c889b8d6d0cc295
Reviewed-on: http://codereview.qt.nokia.com/3342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agotest: marked tst_qdeclarativebehaviors as expected failure
Rohan McGovern [Mon, 22 Aug 2011 06:11:31 +0000 (16:11 +1000)]
test: marked tst_qdeclarativebehaviors as expected failure

This was supposed to be marked in
e5166af2e4856668ea45d31e0d6fb044dc9ab1af, but was accidentally omitted
(note that there are two autotests named tst_qdeclarativebehaviors).

Task-number: QTBUG-21001
Change-Id: I0afeccff776a448e24d76f51cd9b761774067311
Reviewed-on: http://codereview.qt.nokia.com/3288
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agoQML Autotests: Use fuzzy compare for real numbers
Julian de Bhal [Mon, 22 Aug 2011 06:51:03 +0000 (16:51 +1000)]
QML Autotests: Use fuzzy compare for real numbers

Change-Id: I5ae2859d15502b29e3a744e155ceabe50d83bcff
Reviewed-on: http://codereview.qt.nokia.com/3290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoAdd a deformable level shader for QSGImageParticle
Alan Alpert [Thu, 18 Aug 2011 04:31:35 +0000 (14:31 +1000)]
Add a deformable level shader for QSGImageParticle

This shader also implements sizeTable in a GL ES 2 compliant way.

Change-Id: If31ee01a521c1fe13f59f7d6376185bafcefedfc
Reviewed-on: http://codereview.qt.nokia.com/3132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAlways disconnect signals on aborted reply objects
Bea Lam [Mon, 22 Aug 2011 04:44:26 +0000 (14:44 +1000)]
Always disconnect signals on aborted reply objects

reload() did not disconnect the model from an aborted reply's
signals, and if it received a finished() signal from the aborted
reply it crashed when trying to access the deleted d->reply.

Task-number: QTBUG-20842

(cherry-picked from commit d3599ab224f00915045562562c7fd4d6b9b9aeb4
in 4.8)

Change-Id: I09a4b04ccdcf04d0ad19052475376e4d1910b7b9
Reviewed-on: http://codereview.qt.nokia.com/3282
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agotests: acknowledge all known failures in declarative autotests
Rohan McGovern [Sun, 21 Aug 2011 23:25:30 +0000 (09:25 +1000)]
tests: acknowledge all known failures in declarative autotests

This change XFAILs or CONFIG+=insignificant_tests all known failures in
declarative autotests, and links them to bug reports.

Note that the changes were only applied to qpa builds, although it is
possible some of these failures affect other platforms too.

Task-number: QTBUG-20990
Task-number: QTBUG-21000
Task-number: QTBUG-21001
Task-number: QTBUG-21004
Task-number: QTBUG-21005
Task-number: QTBUG-21007
Task-number: QTBUG-21008
Task-number: QTBUG-21009
Task-number: QTBUG-21010
Task-number: QTBUG-21011
Task-number: QTBUG-21012
Task-number: QTBUG-21013
Task-number: QTBUG-21015
Task-number: QTBUG-21016
Task-number: QTBUG-21017
Change-Id: Ieb89aa38e48e9e5162d87483d6441749865f234d
Reviewed-on: http://codereview.qt.nokia.com/3239
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Keith Isdale <keith.isdale@nokia.com>
12 years agoMake QSGTextNode back-end for QML's TextInput and TextEdit
Eskil Abrahamsen Blomfeldt [Wed, 1 Jun 2011 07:45:55 +0000 (09:45 +0200)]
Make QSGTextNode back-end for QML's TextInput and TextEdit

Use the general QSGTextNode class as back-end for all text
elements in QML to make all text elements look the same and
use the same text rasterization back-end. This requires a
few rewrites in the text node to support e.g. selections.

Crashes seen with threaded renderer in TextEdit and TextInput on
Mac are also fixed by this.

Reviewed-by: Jiang Jiang
Task-number: QTBUG-18019, QTBUG-20017
Change-Id: I4207faf180c83422e5f8b726741321af395bd724
Reviewed-on: http://codereview.qt.nokia.com/2865
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agov8 debugging: delay setting of breakpoints till afterCompile
Aurindam Jana [Thu, 18 Aug 2011 09:11:44 +0000 (11:11 +0200)]
v8 debugging: delay setting of breakpoints till afterCompile

The setting of breakpoints is delayed till the complete filepath of the script is determined.

Change-Id: I8875eea3cecf5093c5d43741e26222e03123af84
Reviewed-on: http://codereview.qt.nokia.com/3169
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agomove dom error definitions to seperate files.
Charles Yin [Fri, 19 Aug 2011 02:20:37 +0000 (12:20 +1000)]
move dom error definitions to seperate files.

Change-Id: I90951ab817230e0160831db3ce2e91ceceab1352
Reviewed-on: http://codereview.qt.nokia.com/3235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix unit test failure
Chris Adams [Fri, 19 Aug 2011 03:13:26 +0000 (13:13 +1000)]
Fix unit test failure

Previously had hardcoded tostring comparison value for QFont, but on
some platforms the default styleHint may be different.  This commit
ensures that the comparison value is generated properly rather than
hardcoded.

Task-number: QTBUG-21003
Change-Id: I49229863b10bf5fb96248b9334b66d7b1ef46676
Reviewed-on: http://codereview.qt.nokia.com/3237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix tst_qdeclarativestates autotest.
Michael Brasser [Fri, 19 Aug 2011 02:28:35 +0000 (12:28 +1000)]
Fix tst_qdeclarativestates autotest.

Update test after changes to Column.

Task-number: QTBUG-21002
Change-Id: I12671207cd07ba375f9c90cc02fdc9f81f189678
Reviewed-on: http://codereview.qt.nokia.com/3236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoInternal state class refactoring.
Michael Brasser [Fri, 19 Aug 2011 00:14:59 +0000 (10:14 +1000)]
Internal state class refactoring.

Change-Id: I6e5fe3fa4459f99a50e3aa79c3a87106600f083a
Reviewed-on: http://codereview.qt.nokia.com/3231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agocanvas context2d needs the dom exceptions as well, so share the dom exception definitions
Charles Yin [Fri, 19 Aug 2011 00:52:40 +0000 (10:52 +1000)]
canvas context2d needs the dom exceptions as well, so share the dom exception definitions

Change-Id: I05ab8d87de636944585f4113f07c7d07fe9a79aa
Reviewed-on: http://codereview.qt.nokia.com/3233
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix spacing issue
Alan Alpert [Fri, 19 Aug 2011 00:32:27 +0000 (10:32 +1000)]
Fix spacing issue

Spacing was being incorrectly applied in circumstances where invisible
items existed at the end of a positioner.

Task-number: QTBUG-20961
Change-Id: I49ebc8e96a1564c0ff2bde1c1bb3f91d3c441488
Reviewed-on: http://codereview.qt.nokia.com/3232
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDon't skip autotest and export needed symbol
Gunnar Sletta [Thu, 18 Aug 2011 08:25:38 +0000 (10:25 +0200)]
Don't skip autotest and export needed symbol

Change-Id: Ib5090348cefa955caa54c5e4fff8cb961ddb8e52
Reviewed-on: http://codereview.qt.nokia.com/3147
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoAdd support for a vector4d type in QML
Chris Adams [Thu, 14 Jul 2011 05:40:30 +0000 (15:40 +1000)]
Add support for a vector4d type in QML

QVector4D is a value-type which is supported but was not able to be
constructed using a Qt object function.  This commit allows properties
of vector4d type to be constructed, and adds a function to the global
Qt object and adds unit tests to ensure that it behaves correctly.

Task-number: QTBUG-18559
Change-Id: I96509a4f496b644d20fdb1d977d0afe430d89e13
Reviewed-on: http://codereview.qt.nokia.com/1626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoMake QColor a value type
Chris Adams [Tue, 2 Aug 2011 23:20:18 +0000 (09:20 +1000)]
Make QColor a value type

This commit allows direct access to the r, g, b and a components
of a color (in floating point format: 0 <= v <= 1). Since conversion
from color to string is a common operation, this commit also adds
unit tests to ensure that the previous behaviour is maintained in
other cases (comparison with toString value, etc).

Task-number: QTBUG-14731
Change-Id: I87b521dd4f9c1e96dfe5b20cf8053293cb14cfe4
Reviewed-on: http://codereview.qt.nokia.com/2527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoAdd attached properties to the positioners.
Glenn Watson [Tue, 16 Aug 2011 01:48:14 +0000 (11:48 +1000)]
Add attached properties to the positioners.

Added an attached property type to the base positioner class.
This allows items within a positioner (Row, Column, Grid, Flow) to
determine their index inside the positioner, as well as whether
they are the first or last items. Non-visible items are ignored,
as in the positioner layout objects themselves. It may be useful
to expand this in the future to contain more information specific
to the positioner, for example row/column for Grid.

Task-number: QTBUG-19211
Change-Id: I10a8c9ca5528dd12811125cae8a9b4d2e3747972
Reviewed-on: http://codereview.qt.nokia.com/2983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoUse scissor clip if element is rotated a multiple of 90 degrees.
Kim Motoyoshi Kalland [Wed, 17 Aug 2011 09:56:05 +0000 (11:56 +0200)]
Use scissor clip if element is rotated a multiple of 90 degrees.

Change-Id: I16706049f0ff5a371b5fa95430ca6c2d2f1add96
Reviewed-on: http://codereview.qt.nokia.com/3086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoEnable v8 debugging
Aurindam Jana [Thu, 28 Jul 2011 11:29:52 +0000 (13:29 +0200)]
Enable v8 debugging

Javascript v8 debugging service replaces the QScript debugging service.

Change-Id: I25eea00eed3959b84a8f412e4c3484296d62e27b
Reviewed-on: http://codereview.qt.nokia.com/2614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoFixed mirrored distance-field text.
Kim Motoyoshi Kalland [Wed, 17 Aug 2011 10:19:01 +0000 (12:19 +0200)]
Fixed mirrored distance-field text.

Change-Id: Ib80f30afc72b6ef6a9cabb604656755e0b4dfff1
Reviewed-on: http://codereview.qt.nokia.com/3089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoImplemented minimum FBO size on the ShaderEffectSource.
Kim Motoyoshi Kalland [Mon, 15 Aug 2011 12:46:23 +0000 (14:46 +0200)]
Implemented minimum FBO size on the ShaderEffectSource.

Task-number: QTBUG-20193

Change-Id: I45020c094c4a4892c055700f084fde7b219cdc10
Reviewed-on: http://codereview.qt.nokia.com/2972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoFix repeated compiler warning about unused engine parameter
Simon Hausmann [Wed, 17 Aug 2011 08:43:18 +0000 (10:43 +0200)]
Fix repeated compiler warning about unused engine parameter

It's unused, remove it :)

Change-Id: I75f352dd3e35626603658f78e00cf6b472075df4
Reviewed-on: http://codereview.qt.nokia.com/3074
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoRevert "Set IsDirect flag of property cache data if appropriate"
Kent Hansen [Tue, 16 Aug 2011 07:17:38 +0000 (09:17 +0200)]
Revert "Set IsDirect flag of property cache data if appropriate"

This reverts commit 038619bf2c5e7d2c18a6f463cd994d8b3831e61f.

The commit caused autotest failures.

Change-Id: I46009afde9eb290dda43258e4982b684a87f06d6
Reviewed-on: http://codereview.qt.nokia.com/2992
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoAllow borderimage .sci source to be a quoted filename
Chris Adams [Mon, 8 Aug 2011 05:00:29 +0000 (15:00 +1000)]
Allow borderimage .sci source to be a quoted filename

Previously, attempting to set the source property of a border image
via a .sci file to a quoted filename would fail.  This commit adds
support for quoted source filenames.

Task-number: QTBUG-20709
Change-Id: Ida54ef42bc07081457fd945bb279f3cc82c26e10
Reviewed-on: http://codereview.qt.nokia.com/2724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoAdd module qualifier to \qmlattachedproperty docs
Alan Alpert [Tue, 16 Aug 2011 23:20:22 +0000 (09:20 +1000)]
Add module qualifier to \qmlattachedproperty docs

Was missed by initial script.

Change-Id: Ib5e6482f53bda25b516075b52eb71f87b9279655
Reviewed-on: http://codereview.qt.nokia.com/3057
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFixed clipping on perspective transformed QML2 elements.
Kim Motoyoshi Kalland [Fri, 12 Aug 2011 15:13:38 +0000 (17:13 +0200)]
Fixed clipping on perspective transformed QML2 elements.

Task-number: QTBUG-19901

Change-Id: I1f6bd31f4afec3d9b199086a01ffe5e714a20efa
Reviewed-on: http://codereview.qt.nokia.com/2915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoFixed clip on QML2 rectangles to include the borders.
Kim Motoyoshi Kalland [Mon, 15 Aug 2011 10:55:26 +0000 (12:55 +0200)]
Fixed clip on QML2 rectangles to include the borders.

This is related to commit 31ebb4bfb0df83805c5d86b6773f11ba1145c7cd.

Task-number: QTBUG-20547
Change-Id: I6a5b6c56d440c7fa7f5546472305f62227b64c29
Reviewed-on: http://codereview.qt.nokia.com/2952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoImprove the Qt/JavaScript (QJS) documentation
Kent Hansen [Thu, 11 Aug 2011 11:58:53 +0000 (13:58 +0200)]
Improve the Qt/JavaScript (QJS) documentation

Make sure all public classes and functions are documented.
Fix/remove broken references.
Add code snippets.
Add a minimal "Making Applications Scriptable" page based
on the QtScript docs.

Change-Id: I76a32bff776b478f01ff08b3276a0a020a1fa81f
Reviewed-on: http://codereview.qt.nokia.com/2863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoTweak particle examples
Alan Alpert [Thu, 11 Aug 2011 10:05:19 +0000 (20:05 +1000)]
Tweak particle examples

Some of them weren't scaling well when in the examples launcher.

Change-Id: Ib6049fb5b3c9a99775008ae9072750c2424ad6ed
Reviewed-on: http://codereview.qt.nokia.com/2857
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoGet Custom particle example rotating again
Alan Alpert [Thu, 11 Aug 2011 10:01:09 +0000 (20:01 +1000)]
Get Custom particle example rotating again

Change-Id: I9045f9b76f7c681cf828aa60659abb4c6b521e11
Reviewed-on: http://codereview.qt.nokia.com/2856
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoAdd noCap and startTime properties to Emitter
Alan Alpert [Thu, 11 Aug 2011 09:59:05 +0000 (19:59 +1000)]
Add noCap and startTime properties to Emitter

Change-Id: I8498b2e574a32bfbab9f139e718424572b1258a0
Reviewed-on: http://codereview.qt.nokia.com/2855
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFix VisualDataModel auto test failure.
Andrew den Exter [Mon, 15 Aug 2011 03:30:09 +0000 (13:30 +1000)]
Fix VisualDataModel auto test failure.

Set the DynamicMetaObject flag when constructing an extended type.
Fixes failure introduced in 038619bf2c5e7d2c18a6f463cd994d8b3831e61f.

Change-Id: Idbbbec8f9ec3792b2765639781dba1696fce0a49
Reviewed-on: http://codereview.qt.nokia.com/2927
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoRemove \since tags
Alan Alpert [Thu, 11 Aug 2011 09:38:37 +0000 (19:38 +1000)]
Remove \since tags

It's a new module, of course they're new in this version.

Change-Id: I8bce4d452161cd581c046fec62a41cac4e0609ed
Reviewed-on: http://codereview.qt.nokia.com/2854
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRefactor BasicEmitter into Emitter
Alan Alpert [Thu, 11 Aug 2011 09:36:07 +0000 (19:36 +1000)]
Refactor BasicEmitter into Emitter

No real point having a separate class, and it makes the docs more
complex.

Change-Id: I48aa7bafce541b0b5b792351adb5edf77fc67de2
Reviewed-on: http://codereview.qt.nokia.com/2853
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoSameGame refactor
Alan Alpert [Wed, 10 Aug 2011 03:24:37 +0000 (13:24 +1000)]
SameGame refactor

A little more imperative with dialogs controlled from script, but better
separation of GameArea and UI. Also removes old highscore script that
was never used.

Change-Id: Ib244acc90b0fc92b3a6534169e429b6acef0838e
Reviewed-on: http://codereview.qt.nokia.com/2798
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix race condition in processJobs()
Bea Lam [Thu, 11 Aug 2011 03:26:15 +0000 (13:26 +1000)]
Fix race condition in processJobs()

Don't modify list of running jobs when a job is aborted since the job
may have just started. Wait till the next time processJobs() is invoked
for a new job and discard the aborted job at that time.

(cherry picked from commit f55ecc080d0c5eca4e65a235c63ab13867c86874
in 4.8)

Task-number: QTBUG-20841
Change-Id: Icb4cd089505c0634d3fec023b52c61bbc878404f
Reviewed-on: http://codereview.qt.nokia.com/2837
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFixed QSGNode leak.
Kim Motoyoshi Kalland [Fri, 12 Aug 2011 11:25:27 +0000 (13:25 +0200)]
Fixed QSGNode leak.

QSGItem was setting its node pointer to 0 without deleting it.

Change-Id: I8b52d02069410b1dfc0057f926a52c946ef348a2
Reviewed-on: http://codereview.qt.nokia.com/2910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoUse the correct export macros
Lars Knoll [Mon, 8 Aug 2011 13:38:21 +0000 (15:38 +0200)]
Use the correct export macros

Otherwise we'll get problems when compiling
on Windows.

Change-Id: I2a366da3cd4cd08ba8bc8d9c8c81409737bee697
Reviewed-on: http://codereview.qt.nokia.com/2752
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoCompile.
Bjørn Erik Nilsen [Thu, 11 Aug 2011 13:23:33 +0000 (15:23 +0200)]
Compile.

Change-Id: I13f95b415b28467617c4ca804e706082150d253e
Reviewed-on: http://codereview.qt.nokia.com/2870
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
12 years agoAdded a faster subpixel antialiasing material for distance field text.
Yoann Lopes [Thu, 11 Aug 2011 11:37:23 +0000 (13:37 +0200)]
Added a faster subpixel antialiasing material for distance field text.

Based on two texture samples instead of five.
Can be enabled with qmlscene --text-subpixel-antialiasing-lowq

Change-Id: I726f73d812b93aa9ca38ce142d1e97b9a40d200a
Reviewed-on: http://codereview.qt.nokia.com/2861
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoReplace QScriptBagContainer by QIntrusiveList
Kent Hansen [Thu, 4 Aug 2011 12:19:26 +0000 (14:19 +0200)]
Replace QScriptBagContainer by QIntrusiveList

QIntrusiveList effectively does the same as
QScriptBagContainer, without the need to inherit a
Node class. Let's avoid the code duplication.

However, QIntrusiveList::remove() and insert()
are less strict than QScriptBagContainer; introduce
QScriptIntrusiveList that performs the same sanity
checks (no duplicate insertion, etc). Ideally these
checks would be merged into QIntrusiveList.

Also rename QJSValuePrivate::reinitialize() to
invalidate(), and make it not call
engine->unregisterValue(this) any more. Values are
only invalidated at engine destruction time, and
it's the engine's responsibility to erase the list.

Change-Id: I60fc61ee8f90a716a285b1dd1bf4d6a08a9349df
Reviewed-on: http://codereview.qt.nokia.com/2628
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoSet IsDirect flag of property cache data if appropriate
Kent Hansen [Thu, 11 Aug 2011 07:15:38 +0000 (09:15 +0200)]
Set IsDirect flag of property cache data if appropriate

The IsDirect flag was only set in
QDeclarativePropertyCache::append(), but it should be
set in create() as well.

Change-Id: I43c980e5f7e01e44ade662c11c2daf7a9a44d299
Reviewed-on: http://codereview.qt.nokia.com/2844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoGuard QML-specific handling of value type property access
Kent Hansen [Thu, 11 Aug 2011 07:28:22 +0000 (09:28 +0200)]
Guard QML-specific handling of value type property access

When using QJSEngine, there is no QDeclarativeEngine
associated with the QV8Engine, so check if it's there first.

This was causing the QJS qobject bindings autotest to crash.

Change-Id: If2c1d414d615bfbe93580d06555f5c17b0e41eef
Reviewed-on: http://codereview.qt.nokia.com/2845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRemove initialization warnings
Gunnar Sletta [Thu, 11 Aug 2011 05:38:55 +0000 (07:38 +0200)]
Remove initialization warnings

Change-Id: Ie11a91034174b248b564fa5d8af8905a79b6eacf
Reviewed-on: http://codereview.qt.nokia.com/2841
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoRespect $$QT.declarative.bins
Rohan McGovern [Wed, 10 Aug 2011 05:06:35 +0000 (15:06 +1000)]
Respect $$QT.declarative.bins

A module's tools should build directly into $$QT.<module>.bins, just
like its libraries and plugins.

Change-Id: Ic5e885ae0fe99220e07fd643d9bb5b28008e0fa5
Reviewed-on: http://codereview.qt.nokia.com/2802
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
12 years agoMigrate part of QtScript benchmarks to QtDeclarative
Jedrzej Nowacki [Fri, 5 Aug 2011 15:21:20 +0000 (17:21 +0200)]
Migrate part of QtScript benchmarks to QtDeclarative

Benchmarks for QJSValue QJSEngine and for QJSValueIterator were added.

Change-Id: Ie52a3e8f5a461add3269d41d6e9a1a9bfb0c7abd
Reviewed-on: http://codereview.qt.nokia.com/2705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoCode cleanup: unify QRegExp conversion.
Jedrzej Nowacki [Thu, 4 Aug 2011 13:13:47 +0000 (15:13 +0200)]
Code cleanup: unify QRegExp conversion.

Remove duplicated code for QRegExp conversion.

Change-Id: Ic0a6b68a317404ac6d1695f0220f257046b4ba80
Reviewed-on: http://codereview.qt.nokia.com/2703
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoAdd missing check in QJSValue::property
Jedrzej Nowacki [Thu, 4 Aug 2011 11:20:12 +0000 (13:20 +0200)]
Add missing check in QJSValue::property

Only an object can have a property.

Change-Id: I032cf3a08f777b6b47cb5a417fa796059bfc9ef5
Reviewed-on: http://codereview.qt.nokia.com/2702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoCode cleanup: unify string conversions.
Jedrzej Nowacki [Thu, 4 Aug 2011 09:21:57 +0000 (11:21 +0200)]
Code cleanup: unify string conversions.

Unify string conversions when there is not any external string wrapper.

Change-Id: I6665e33c968b9d1c6ad86595639967ddcd257667
Reviewed-on: http://codereview.qt.nokia.com/2701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoCode cleanup.
Jedrzej Nowacki [Thu, 4 Aug 2011 09:17:01 +0000 (11:17 +0200)]
Code cleanup.

Remove redundant else conditions.

Change-Id: I5795bd931d9204a31e0edfea0d3489c119db1020
Reviewed-on: http://codereview.qt.nokia.com/2700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoReplace duplicated code by a function call.
Jedrzej Nowacki [Thu, 4 Aug 2011 09:12:48 +0000 (11:12 +0200)]
Replace duplicated code by a function call.

According to comment the code was copied from QtScript. As the
implementation is merged to QtDeclarative we can use common code path.

Change-Id: Id603ef0207a1356f8c010a35fe601568a03aac48
Reviewed-on: http://codereview.qt.nokia.com/2699
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoQSGDistanceFieldGlyphCache code refactoring.
Yoann Lopes [Tue, 9 Aug 2011 14:03:42 +0000 (16:03 +0200)]
QSGDistanceFieldGlyphCache code refactoring.

The distance field glyph caches are now contained in the QSGContext.

Change-Id: Ifc5d155917314b1cc5905ef86fdad0bbc5635c7d
Reviewed-on: http://codereview.qt.nokia.com/2787
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoAdd support for individual row and column spacing to Grid object.
Glenn Watson [Wed, 10 Aug 2011 03:51:32 +0000 (13:51 +1000)]
Add support for individual row and column spacing to Grid object.

Add rowSpacing and columnSpacing properties to QML Grid object. If
these are specified, use them when laying out the grid. If they are
not specified, default to using the spacing property that was
previously used, so it is backwards compatible.

Task-number: QTBUG-11876
Change-Id: I5c809e89fe124d8d5ea1667b273f19e2c37ff18a
Reviewed-on: http://codereview.qt.nokia.com/2797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoMake distance field text more easily configurable.
Yoann Lopes [Tue, 9 Aug 2011 09:39:40 +0000 (11:39 +0200)]
Make distance field text more easily configurable.

Custom functions can be provided to compute the distance field threshold
value and antialiasing range.

Change-Id: Ie2ec8160d81671dedf72f0c72c3a5cbdf04d993a
Reviewed-on: http://codereview.qt.nokia.com/2772
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoAdd documentation
Alan Alpert [Mon, 8 Aug 2011 08:03:31 +0000 (18:03 +1000)]
Add documentation

Copy the documentation back to the scenegraph items, and update it to
the new module syntax.

Change-Id: I5d030a231f991a209a8593ddb069e1b6cd03580e
Reviewed-on: http://codereview.qt.nokia.com/2735
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoCopy the docs for QtQuick 1
Alan Alpert [Tue, 9 Aug 2011 01:49:57 +0000 (11:49 +1000)]
Copy the docs for QtQuick 1

Change-Id: Iaaaaaaa13726fa471f94fc7f809911164df24544
Reviewed-on: http://codereview.qt.nokia.com/2755
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoRevise QDeclarativeChangeSet.
Andrew den Exter [Mon, 8 Aug 2011 01:57:39 +0000 (11:57 +1000)]
Revise QDeclarativeChangeSet.

Represent moves as associated Removes and Inserts instead of discrete
actions.  Add API for applying a set of changes to another change set.

Change-Id: Id97c1648c7480023dbfef325150bb81c2fea95c0
Reviewed-on: http://codereview.qt.nokia.com/2720
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoAdd combustion to examples launcher
Alan Alpert [Wed, 3 Aug 2011 01:29:56 +0000 (11:29 +1000)]
Add combustion to examples launcher

Change-Id: Ie6a7e825afac9a969a71487b93800180ff3be90d
Reviewed-on: http://codereview.qt.nokia.com/2532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoparse args earlier
Charles Yin [Mon, 8 Aug 2011 01:35:48 +0000 (11:35 +1000)]
parse args earlier

Change-Id: Ie0869d3f70d1e898a9b0635e28bcad2e92fa607c
Reviewed-on: http://codereview.qt.nokia.com/2718
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoremove app bundle config for mac
Charles Yin [Mon, 8 Aug 2011 01:35:01 +0000 (11:35 +1000)]
remove app bundle config for mac

Change-Id: I3b526dc556f714b5df712699f64b6bdc51971554
Reviewed-on: http://codereview.qt.nokia.com/2717
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoFix broken test (view did not have focus set)
Bea Lam [Mon, 8 Aug 2011 01:15:30 +0000 (11:15 +1000)]
Fix broken test (view did not have focus set)

Change-Id: I25e68df061510deadd946d1a034c114dfd0b4f1c
Reviewed-on: http://codereview.qt.nokia.com/2715
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoadd dummy notify signals to remove warnings
Charles Yin [Mon, 8 Aug 2011 00:12:27 +0000 (10:12 +1000)]
add dummy notify signals to remove warnings

Change-Id: Id8eca4ca2d72a1b3a4293d6ed19ef7f3fdb02d37
Reviewed-on: http://codereview.qt.nokia.com/2712
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agodon't create QApplication if there is already one there
Charles Yin [Sun, 7 Aug 2011 23:45:52 +0000 (09:45 +1000)]
don't create QApplication if there is already one there

Change-Id: Iaf9ebf6855992962abfb3452dc398149af15bbbc
Reviewed-on: http://codereview.qt.nokia.com/2711
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoShow header/footer if current index is set to first/last item or row
Bea Lam [Fri, 5 Aug 2011 05:48:16 +0000 (15:48 +1000)]
Show header/footer if current index is set to first/last item or row

Task-number: QTBUG-17853
Change-Id: I1d679cee31d6ee2a4bb2f2bf90f73eb12898189b
Reviewed-on: http://codereview.qt.nokia.com/2664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoListView with StrictlyEnforceRange skips over items
Martin Jones [Fri, 5 Aug 2011 03:44:38 +0000 (13:44 +1000)]
ListView with StrictlyEnforceRange skips over items

When list item size varies smaller items next to larger
items may not be able to become the current item.  Ensure
the snap item is found using the correct range, i.e.
half of previous item above snap pos and half of next item
below.

Change-Id: I52ae235e6b801bda48fcb636bb4150ab643715e8
Fixes: QTBUG-20745
Reviewed-on: http://codereview.qt.nokia.com/2650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoAdd missing license headers.
Jason McDonald [Thu, 4 Aug 2011 07:42:36 +0000 (17:42 +1000)]
Add missing license headers.

Change-Id: Ib71e988f6a0d87f1f9afe407e206eaa68137a537
Reviewed-on: http://codereview.qt.nokia.com/2604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix outdated license headers.
Jason McDonald [Thu, 4 Aug 2011 06:20:18 +0000 (16:20 +1000)]
Fix outdated license headers.

Change-Id: I81fd41433b03b13befe0b5c68ec248ea71e8c235
Reviewed-on: http://codereview.qt.nokia.com/2596
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDon't cache model data in VisualDataModel.
Andrew den Exter [Tue, 2 Aug 2011 05:19:06 +0000 (15:19 +1000)]
Don't cache model data in VisualDataModel.

VisualDataModel doesn't have any way to monitor the lifetime of objects
cached other than relying on the source model to emit a changed signal.
If the model doesn't do this or a pointer property is referenced after
an item has been removed from the model then cache can return a stale
pointer.  This can be avoided by querying the model directly whenever
a property is accessed.

Task-number: QTBUG-18036

Change-Id: I7688174c2337cb5c0f77eb7d31a01f4aa958071b
Reviewed-on: http://codereview.qt.nokia.com/2647
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMove shell example from QtScript to QtDeclarative.
Jedrzej Nowacki [Tue, 2 Aug 2011 07:52:43 +0000 (09:52 +0200)]
Move shell example from QtScript to QtDeclarative.

The example is interesting as debugging tool too.

Change-Id: I9ba69a85f21b776bbfcc65469c8a0e90426f21fd
Reviewed-on: http://codereview.qt.nokia.com/2495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoRemove dead code from QJSValuePrivate
Kent Hansen [Thu, 4 Aug 2011 11:42:15 +0000 (13:42 +0200)]
Remove dead code from QJSValuePrivate

reinitialize() was used to implement setGlobalObject()
and setScriptClass() in the QtScript/V8 port, but those
functions will not be part of the new JS API.

Change-Id: I030d371659136a407636c7a13afe7623a60a2837
Reviewed-on: http://codereview.qt.nokia.com/2623
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoMove QJSValue InvalidValue definition to "inline" header
Kent Hansen [Thu, 4 Aug 2011 11:16:12 +0000 (13:16 +0200)]
Move QJSValue InvalidValue definition to "inline" header

Avoid warning "inline function ‘QJSValuePrivate::QJSValuePrivate()’
used but never defined" when only qjsvalue_p.h is included
for a compilation unit.

Change-Id: I75bb49dedbfcedf5f71c25210371f03663572b46
Reviewed-on: http://codereview.qt.nokia.com/2620
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoAdd QIntrusiveList::contains() function
Kent Hansen [Wed, 3 Aug 2011 13:05:25 +0000 (15:05 +0200)]
Add QIntrusiveList::contains() function

QIntrusiveList is nice, but it needs a contains() function.

Change-Id: I17adf63db080ffd39acac18cd8ecb23e48d76ed6
Reviewed-on: http://codereview.qt.nokia.com/2569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRemove dead code.
Jedrzej Nowacki [Wed, 3 Aug 2011 15:07:17 +0000 (17:07 +0200)]
Remove dead code.

Structure was not used.

Change-Id: Ib3a67f8a1850c211bb0b0700c10153eb9ab6441a
Reviewed-on: http://codereview.qt.nokia.com/2583
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoFix ListView refill() where delegate size == 0
Bea Lam [Wed, 3 Aug 2011 05:40:58 +0000 (15:40 +1000)]
Fix ListView refill() where delegate size == 0

When refilling, if a delegate item is positioned at the start of the
buffer, it should only be removed if its height is > 0. Otherwise
refill() will constantly remove it in removeNonVisibleItems() and
add it again in the next frame in addVisibleItems().

Regression from aa99d4f5cb4f1f512d1db90536752b518dbea449

Task-number: QTBUG-20712
Change-Id: I21d25fde21e0b559a378c9e202ace58947417a4d
Reviewed-on: http://codereview.qt.nokia.com/2541
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoImproved support for multiple to/from values in Transition.
Michael Brasser [Thu, 4 Aug 2011 03:51:24 +0000 (13:51 +1000)]
Improved support for multiple to/from values in Transition.

Trim the strings (previously "state1,state2" would work, but not
"state1, state2", and document the feature.

Task-number: QTBUG-14713
Change-Id: Ie0c5f803754751008c3e1bf766f08914f743338f
Reviewed-on: http://codereview.qt.nokia.com/2592
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoRework threading internals in XmlListModel to avoid global static
Bea Lam [Thu, 4 Aug 2011 05:02:37 +0000 (15:02 +1000)]
Rework threading internals in XmlListModel to avoid global static

QTBUG-20629 reports a crash on destruction of XmlListModel when
cleaning up the global static for the QDeclarativeXmlQuery object.

The fix restructures the internals to be like the threading structure
used for QDeclarativePixmapReader which doesn't use a global static.

Task-number: QTBUG-20629
Reviewed-by: Martin Jones
(cherry picked from commit 422f4e8ec53b917fad09a3e671fd93048dde72ed in
qt-qml-staging:master)

Change-Id: Ic26164947abab67ec9d8f1ae68c20961e7af8a2b
Reviewed-on: http://codereview.qt.nokia.com/2595
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoImprove error messages from compiler for signals and slots
Chris Adams [Wed, 3 Aug 2011 04:00:57 +0000 (14:00 +1000)]
Improve error messages from compiler for signals and slots

This commit ensures that correct line and column information is
provided in some cases (duplicate signal or method name, etc).

Task-number: QTBUG-15076
Change-Id: I483bdc92ef4f1d1d2ff565bb957385fd495672da
Reviewed-on: http://codereview.qt.nokia.com/1619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoHonour the resettable flag of aliased properties
Chris Adams [Tue, 12 Jul 2011 04:05:24 +0000 (14:05 +1000)]
Honour the resettable flag of aliased properties

Previously, alias properties were not considered isResettable even
if the property they alias is resettable.  This commit ensures that
the IsResettable flag is set for alias properties iff the aliased
property is resettable, and that it is honoured during property
reset operations.

Task-number: QTBUG-18182
Change-Id: I9cab11923a952df72e976a48489a78b24a34314f
Reviewed-on: http://codereview.qt.nokia.com/1471
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>