summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix build break introduced by changes in QTestLog.Xizhi Zhu2011-08-291-2/+2
| | | | | | | | | 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>
* Use the optimized QDeclarativeExpression constructor where possible.Michael Brasser2011-08-294-15/+7
| | | | | | | | | | | 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>
* qmlplugindump: Load QtQuick 1 plugin.Christian Kamm2011-08-292-1/+14
| | | | | | | | | 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>
* Fix QSGItem::polish() at startup logicAaron Kennedy2011-08-291-0/+2
| | | | | | | 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>
* Re-add QDeclarativeFontLoader autotest.Michael Brasser2011-08-295-0/+248
| | | | | | | | 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>
* Remove unnecessary code.Michael Brasser2011-08-293-11/+4
| | | | | | | | | | 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>
* Deprecate QDeclarativeDebugHelper classKai Koehne2011-08-2616-220/+17
| | | | | | | | | | 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>
* Don't enumerate Function.prototype.{connect,disconnect}Kent Hansen2011-08-262-2/+21
| | | | | | | | | | | | | | | 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>
* Fix memory leak in ListModel custom parserBea Lam2011-08-262-0/+2
| | | | | | | | | | | | | 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>
* Move QSGViewPrivate to qsgview_p.hMarco Bubke2011-08-253-31/+109
| | | | | | | | | 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>
* Get the image of the FBO of a effect textureMarco Bubke2011-08-252-0/+10
| | | | | | | | | | | 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>
* qsgflickable test is unstableMartin Jones2011-08-251-1/+2
| | | | | | | | | | | 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>
* Add custom emission capability to FollowEmitterAlan Alpert2011-08-254-3/+26
| | | | | | | | | | 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>
* Fix leak in tst_qsgitem::wheelEvent() autotestCaio Marcelo de Oliveira Filho2011-08-251-0/+2
| | | | | | | 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>
* Update v8Aaron Kennedy2011-08-2514-44/+175
| | | | | | | 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>
* update .gitignoreCharles Yin2011-08-251-0/+13
| | | | | | Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56 Reviewed-on: http://codereview.qt.nokia.com/3345 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Debug Service: Synchronize with v8 debug client.Aurindam Jana2011-08-241-15/+60
| | | | | | | | | | 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>
* Slightly reduce distance-field texture creation (and resizing) time.Yoann Lopes2011-08-241-4/+1
| | | | | | | | | 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>
* Fixed QSGPaintedItem updates when a contentsScale is set.Yoann Lopes2011-08-241-7/+2
| | | | | | | 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>
* DeclarativeDebug: Clear service name when returning from waitForMessageAurindam Jana2011-08-241-3/+7
| | | | | | | | | | | 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>
* Absorb CustomEmitter/AffectorAlan Alpert2011-08-2412-420/+47
| | | | | | | | | | 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>
* Lift particle limits on desktopAlan Alpert2011-08-242-2/+6
| | | | | | | 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>
* Switch from textures to uniform arrays for size/opacity tablesAlan Alpert2011-08-244-48/+48
| | | | | | | 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>
* Fix tst_qjsvalue::castToPointer test failureKent Hansen2011-08-245-11/+14
| | | | | | | | | | | | | 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>
* mapFromModel() returned incorrect valueBea Lam2011-08-241-1/+1
| | | | | | | | | | | | | 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>
* reenable tst_examplesAlan Alpert2011-08-241-1/+0
| | | | | | | | | | 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>
* disable the canvas svgpath example temporarily.Charles Yin2011-08-242-848/+0
| | | | | | Change-Id: I368acd65e9d352ecc04f4f7aaa3efc43d4530530 Reviewed-on: http://codereview.qt.nokia.com/3440 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Do not deliver mouse wheel events when item is not visibleCaio Marcelo de Oliveira Filho2011-08-242-2/+49
| | | | | | | | | | | | | | 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>
* Compile on MacAlan Alpert2011-08-241-10/+25
| | | | | | | 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>
* Switch to using one shader and #ifdefsAlan Alpert2011-08-245-35/+231
| | | | | | | | | 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>
* Initial entryEffect support for ImageParticleAlan Alpert2011-08-247-20/+103
| | | | | | | | | | 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>
* Use point spritesAlan Alpert2011-08-246-52/+77
| | | | | | | | | 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>
* test: marked tst_examples as insignificant_test on x11Rohan McGovern2011-08-241-0/+1
| | | | | | | | | | 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>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
| | | | | | | 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>
* Add the rest of the tiered shaders to QSGImageParticleAlan Alpert2011-08-2319-814/+531
| | | | | | | | 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>
* Add console debugging for particlesAlan Alpert2011-08-232-1/+16
| | | | | | | | 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>
* test: marked expected failure in tst_qsgtextinputRohan McGovern2011-08-231-0/+4
| | | | | | | | | | | 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>
* test: marked tst_qsgfocusscope as insignificantRohan McGovern2011-08-231-0/+2
| | | | | | | | | | 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>
* test: marked tst_qdeclarativebehaviors as expected failureRohan McGovern2011-08-231-0/+3
| | | | | | | | | | | | 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>
* QML Autotests: Use fuzzy compare for real numbersJulian de Bhal2011-08-231-2/+2
| | | | | | | 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>
* Add a deformable level shader for QSGImageParticleAlan Alpert2011-08-225-35/+354
| | | | | | | | | 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>
* Always disconnect signals on aborted reply objectsBea Lam2011-08-221-13/+15
| | | | | | | | | | | | | | | | 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>
* tests: acknowledge all known failures in declarative autotestsRohan McGovern2011-08-2216-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Make QSGTextNode back-end for QML's TextInput and TextEditEskil Abrahamsen Blomfeldt2011-08-1916-260/+1216
| | | | | | | | | | | | | | | | 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>
* v8 debugging: delay setting of breakpoints till afterCompileAurindam Jana2011-08-191-7/+27
| | | | | | | | 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>
* move dom error definitions to seperate files.Charles Yin2011-08-196-53/+172
| | | | | | | 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>
* Fix unit test failureChris Adams2011-08-191-1/+1
| | | | | | | | | | | | | 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>
* Fix tst_qdeclarativestates autotest.Michael Brasser2011-08-193-8/+10
| | | | | | | | | | 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>
* Internal state class refactoring.Michael Brasser2011-08-197-19/+31
| | | | | | | 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>
* canvas context2d needs the dom exceptions as well, so share the dom ↵Charles Yin2011-08-193-60/+66
| | | | | | | | | 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>