profile/ivi/qtdeclarative.git
13 years agoFix Attractor affector
Alan Alpert [Tue, 30 Aug 2011 01:41:16 +0000 (11:41 +1000)]
Fix Attractor affector

Wasn't simulating the physics right, interacted wrong with other
attractors when in Velocity mode.

Change-Id: I5883eb748b398494ad552e35f06d1167da6023a6
Reviewed-on: http://codereview.qt.nokia.com/3835
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoFix entryEffect for Sprite performance level
Alan Alpert [Thu, 25 Aug 2011 07:19:17 +0000 (17:19 +1000)]
Fix entryEffect for Sprite performance level

Change-Id: Icca2e6662a640242b4e676cd07b084a38dab5fb7
Reviewed-on: http://codereview.qt.nokia.com/3570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAdd an update flag to Custom Affectors
Alan Alpert [Thu, 25 Aug 2011 01:55:23 +0000 (11:55 +1000)]
Add an update flag to Custom Affectors

Slight optimization, as it doesn't have to reload the vertex buffer on
every particle every tick now.

Change-Id: I272ec79bfc80c00a1f08de4d81059d0e0b36fb29
Reviewed-on: http://codereview.qt.nokia.com/3543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoUpdate ShaderEffect docs with module qualifiers
Alan Alpert [Thu, 25 Aug 2011 00:51:56 +0000 (10:51 +1000)]
Update ShaderEffect docs with module qualifiers

Change-Id: I603808ab4b7ce8326f6e94bad341d8a466785eff
Reviewed-on: http://codereview.qt.nokia.com/3541
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
13 years agoImplement script module api property get and set
Chris Adams [Wed, 3 Aug 2011 01:04:01 +0000 (11:04 +1000)]
Implement script module api property get and set

This commit adds code for property get and set for script module
APIs, and also splits up the module API unit tests into QObject and
Script (QJSValue) parts.
Related to commit: 3ee8a19f5b7142b96e2df649ea0dac444b5622a2

Task-number: QMLNG-33
Task-number: QTBUG-17318
Change-Id: I4aaf5d1cc1d4774dd0f0999f0985439e4d76f0ca
Reviewed-on: http://codereview.qt.nokia.com/1472
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoRevert swap interval change in 107bf9e570e4d7ce1eb38452c9a5473b2455d9c7
Aaron Kennedy [Fri, 26 Aug 2011 04:33:00 +0000 (14:33 +1000)]
Revert swap interval change in 107bf9e570e4d7ce1eb38452c9a5473b2455d9c7

This was mistakenly checked in when trying to measure maximum framerate.

Change-Id: Ie0f4d0602bee10a61466f3239827cb4d54ecba27
Reviewed-on: http://codereview.qt.nokia.com/3626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoPosition in updatePolish instead of using single shot timer
Alan Alpert [Mon, 29 Aug 2011 02:44:13 +0000 (12:44 +1000)]
Position in updatePolish instead of using single shot timer

Related to QTBUG-18919, but that was not reproduceable.

Rewrites a fair bit of the autotest to no longer rely on repositionings
happening immediately.

Change-Id: I80683d6e03a5543fc838cdd55b2d53e49a8a68bd
Reviewed-on: http://codereview.qt.nokia.com/3690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoFix conversion of QAbstractItemModel::rowsMoved() parameters
Bea Lam [Mon, 29 Aug 2011 03:58:05 +0000 (13:58 +1000)]
Fix conversion of QAbstractItemModel::rowsMoved() parameters

VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.

(change cherry picked from b64817858484db6e7c280d41ed81d4c87dff2275)

Change-Id: I684eb1716d2ad6e0f702e95d9c0cd5c6fe2c9cbb
Reviewed-on: http://codereview.qt.nokia.com/3694
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoAlways disconnect signals on aborted reply objects
Bea Lam [Fri, 12 Aug 2011 04:20:38 +0000 (14:20 +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.

(cherry picked from commit d3599ab224f00915045562562c7fd4d6b9b9aeb4)

Task-number: QTBUG-20842
Change-Id: I812ddc1feb03ee824aa0b32e1aca3fee9344c448
Reviewed-on: http://codereview.qt.nokia.com/2893
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoCompile fix for QML object creation benchmark.
Michael Brasser [Mon, 29 Aug 2011 22:17:48 +0000 (08:17 +1000)]
Compile fix for QML object creation benchmark.

Change-Id: I0a2948728796e72651c86f84f0a296b63e22044f
Reviewed-on: http://codereview.qt.nokia.com/3825
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoRemove V8 submodule from QtDeclarative
Kent Hansen [Tue, 16 Aug 2011 12:00:13 +0000 (14:00 +0200)]
Remove V8 submodule from QtDeclarative

QtDeclarative should now link against the QtV8 library
from qtbase.

The patch files have been moved to qtbase as well.

Applications that use the QtDeclarative private headers
may need to add the following to their .pro file:

QT += v8-private

This ensures that <private/v8.h> is found, which is
(indirectly) included by many QtDeclarative private
headers.

Task-number: QTBUG-20963

Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b
Reviewed-on: http://codereview.qt.nokia.com/3093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoFix build break introduced by changes in QTestLog.
Xizhi Zhu [Mon, 29 Aug 2011 10:55:09 +0000 (13:55 +0300)]
Fix build break introduced by changes in QTestLog.

The mode parameter of QTestLog::addSkip() has been removed, more details at: http://codereview.qt.nokia.com/3547

Change-Id: Id5428a506d177ae9d4480a522ee492672048dad7
Reviewed-on: http://codereview.qt.nokia.com/3735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
13 years agoUse the optimized QDeclarativeExpression constructor where possible.
Michael Brasser [Mon, 29 Aug 2011 05:06:14 +0000 (15:06 +1000)]
Use the optimized QDeclarativeExpression constructor where possible.

Pass in the QDeclarativeScriptString directly, to make use of the
precompiled binding. Also does some minor cleanup of the related
internal implementation.

Change-Id: I4b199298c9da3ee11c51c9c98b384c8324f62c26
Reviewed-on: http://codereview.qt.nokia.com/3696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoqmlplugindump: Load QtQuick 1 plugin.
Christian Kamm [Fri, 26 Aug 2011 08:47:13 +0000 (10:47 +0200)]
qmlplugindump: Load QtQuick 1 plugin.

This allows the QtQuick1 types to be dumped with --builtin and to be
skipped when dumping other plugins that use them.

Change-Id: I23ecba5cea7c11e998861746f1c7056e8911abf3
Reviewed-on: http://codereview.qt.nokia.com/3650
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
13 years agoFix QSGItem::polish() at startup logic
Aaron Kennedy [Fri, 26 Aug 2011 06:35:57 +0000 (16:35 +1000)]
Fix QSGItem::polish() at startup logic

Change-Id: I4e3f81bd8e95d34fe59e39b1ae807211e00aaaa5
Reviewed-on: http://codereview.qt.nokia.com/3632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoRe-add QDeclarativeFontLoader autotest.
Michael Brasser [Mon, 29 Aug 2011 00:29:01 +0000 (10:29 +1000)]
Re-add QDeclarativeFontLoader autotest.

Was accidently removed in the qtquick1 work.

Change-Id: I511efa65e85858e22909257a95f635d5c06cb0a5
Reviewed-on: http://codereview.qt.nokia.com/3685
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoRemove unnecessary code.
Michael Brasser [Fri, 26 Aug 2011 00:56:46 +0000 (10:56 +1000)]
Remove unnecessary code.

QT_NO_LOCALFILE_OPTIMIZED_QML should never be defined, and we don't
need to manually resolve urls coming from QML.

Change-Id: I7cdeb2814385bcb9d6004ab43686f65d388620eb
Reviewed-on: http://codereview.qt.nokia.com/3684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDeprecate QDeclarativeDebugHelper class
Kai Koehne [Wed, 24 Aug 2011 13:14:59 +0000 (15:14 +0200)]
Deprecate QDeclarativeDebugHelper class

This was a helper class for enable debugging in 4.7. Since Qt 4.8 you
should just say CONFIG += declarative_debug

Change-Id: I51dabaec36e175a097721570061aad38c3f828d1
Reviewed-on: http://codereview.qt.nokia.com/3507
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoDon't enumerate Function.prototype.{connect,disconnect}
Kent Hansen [Thu, 25 Aug 2011 10:51:03 +0000 (12:51 +0200)]
Don't enumerate Function.prototype.{connect,disconnect}

QML/JS adds connect and disconnect methods to the standard
Function.prototype object.
Follow the convention of ECMA-262: Function properties should
be non-enumerable.
In particular, we don't want such built-in properties to show
up in user code "for-in" statements.

Task-number: QTBUG-21120
Change-Id: I416106badf35daddf32e16f757d37b2b09e58310
Reviewed-on: http://codereview.qt.nokia.com/3587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
13 years agoFix memory leak in ListModel custom parser
Bea Lam [Thu, 25 Aug 2011 07:03:10 +0000 (17:03 +1000)]
Fix memory leak in ListModel custom parser

ModelNodes created by the parser for ListElement definitions were not
deleted.

(cherry picked from commit c1491c356f3cca92a359468ce37f38bc1873eec4)

Task-number: QTBUG-21084
Change-Id: Ic55a054bb8e30cdabd11080e4f827df5deb1a014
Reviewed-on: http://codereview.qt.nokia.com/3567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoMove QSGViewPrivate to qsgview_p.h
Marco Bubke [Wed, 24 Aug 2011 13:47:35 +0000 (15:47 +0200)]
Move QSGViewPrivate to qsgview_p.h

For the qml designer we need access to the private class.

Change-Id: I2f368daf8e79baa433d11b69a29ef37d53a18a36
Reviewed-on: http://codereview.qt.nokia.com/3508
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoGet the image of the FBO of a effect texture
Marco Bubke [Wed, 24 Aug 2011 13:48:03 +0000 (15:48 +0200)]
Get the image of the FBO of a effect texture

The Qml Designer needs this image because every item in the text file is
rendered in an external process in an image and send over a socket to the
main process.

Change-Id: I73cbc798d783098d3e1937181259c227b008082e
Reviewed-on: http://codereview.qt.nokia.com/3509
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoqsgflickable test is unstable
Martin Jones [Thu, 25 Aug 2011 04:14:25 +0000 (14:14 +1000)]
qsgflickable test is unstable

Ensure that the flickable animation finishes before flicking in the
other axis is initiated.

Task-number: QTBUG-21096
Change-Id: I97bdbc539d9b5af999c0c3d186c35a75a029194d
Reviewed-on: http://codereview.qt.nokia.com/3553
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAdd custom emission capability to FollowEmitter
Alan Alpert [Tue, 23 Aug 2011 10:37:39 +0000 (20:37 +1000)]
Add custom emission capability to FollowEmitter

Also implement speedFromMovement (a convenience now) and fix
a bug in QSGParticleData::curSize()

Change-Id: I831494f24f4b4afaee47524e4a4060f06fefdb0a
Reviewed-on: http://codereview.qt.nokia.com/3396
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFix leak in tst_qsgitem::wheelEvent() autotest
Caio Marcelo de Oliveira Filho [Wed, 24 Aug 2011 23:45:41 +0000 (20:45 -0300)]
Fix leak in tst_qsgitem::wheelEvent() autotest

Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f95
Reviewed-on: http://codereview.qt.nokia.com/3539
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoUpdate v8
Aaron Kennedy [Thu, 25 Aug 2011 01:15:02 +0000 (11:15 +1000)]
Update v8

Change-Id: I576fb2215345aa6599cfb75c6a27544260b2c145
Reviewed-on: http://codereview.qt.nokia.com/3536
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoupdate .gitignore
Charles Yin [Tue, 23 Aug 2011 01:30:43 +0000 (11:30 +1000)]
update .gitignore

Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56
Reviewed-on: http://codereview.qt.nokia.com/3345
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>
13 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>