summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix spacing issueAlan Alpert2011-08-191-4/+6
| | | | | | | | | | | 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>
* Don't skip autotest and export needed symbolGunnar Sletta2011-08-192-3/+1
| | | | | | | 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>
* Add support for a vector4d type in QMLChris Adams2011-08-1815-0/+162
| | | | | | | | | | | | | 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>
* Make QColor a value typeChris Adams2011-08-187-0/+244
| | | | | | | | | | | | | | 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>
* Add attached properties to the positioners.Glenn Watson2011-08-1812-4/+596
| | | | | | | | | | | | | | | | 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>
* Use scissor clip if element is rotated a multiple of 90 degrees.Kim Motoyoshi Kalland2011-08-171-9/+23
| | | | | | | 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>
* Enable v8 debuggingAurindam Jana2011-08-1712-1003/+257
| | | | | | | | | 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>
* Fixed mirrored distance-field text.Kim Motoyoshi Kalland2011-08-171-1/+1
| | | | | | | 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>
* Implemented minimum FBO size on the ShaderEffectSource.Kim Motoyoshi Kalland2011-08-173-4/+33
| | | | | | | | | 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>
* Fix repeated compiler warning about unused engine parameterSimon Hausmann2011-08-172-3/+3
| | | | | | | | | 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>
* Revert "Set IsDirect flag of property cache data if appropriate"Kent Hansen2011-08-171-4/+0
| | | | | | | | | | | 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>
* Allow borderimage .sci source to be a quoted filenameChris Adams2011-08-176-0/+22
| | | | | | | | | | | | | 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>
* Add module qualifier to \qmlattachedproperty docsAlan Alpert2011-08-175-14/+14
| | | | | | | | | 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>
* Fixed clipping on perspective transformed QML2 elements.Kim Motoyoshi Kalland2011-08-161-2/+2
| | | | | | | | | 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>
* Fixed clip on QML2 rectangles to include the borders.Kim Motoyoshi Kalland2011-08-163-13/+23
| | | | | | | | | | 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>
* Improve the Qt/JavaScript (QJS) documentationKent Hansen2011-08-1510-60/+744
| | | | | | | | | | | | | 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>
* Tweak particle examplesAlan Alpert2011-08-153-4/+4
| | | | | | | | | 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>
* Get Custom particle example rotating againAlan Alpert2011-08-151-4/+4
| | | | | | | 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>
* Add noCap and startTime properties to EmitterAlan Alpert2011-08-154-7/+64
| | | | | | | 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>
* Fix VisualDataModel auto test failure.Andrew den Exter2011-08-151-0/+1
| | | | | | | | | | 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>
* Remove \since tagsAlan Alpert2011-08-1527-27/+0
| | | | | | | | | 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>
* Refactor BasicEmitter into EmitterAlan Alpert2011-08-157-436/+303
| | | | | | | | | | 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>
* SameGame refactorAlan Alpert2011-08-1511-206/+220
| | | | | | | | | | 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>
* Fix race condition in processJobs()Bea Lam2011-08-131-19/+10
| | | | | | | | | | | | | | | 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>
* Fixed QSGNode leak.Kim Motoyoshi Kalland2011-08-123-8/+32
| | | | | | | | | 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>
* Use the correct export macrosLars Knoll2011-08-113-6/+6
| | | | | | | | | | 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>
* Compile.Bjørn Erik Nilsen2011-08-111-1/+1
| | | | | | | 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>
* Added a faster subpixel antialiasing material for distance field text.Yoann Lopes2011-08-116-18/+98
| | | | | | | | | | 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>
* Replace QScriptBagContainer by QIntrusiveListKent Hansen2011-08-116-184/+49
| | | | | | | | | | | | | | | | | | | | | | | 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>
* Set IsDirect flag of property cache data if appropriateKent Hansen2011-08-111-0/+4
| | | | | | | | | | | 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>
* Guard QML-specific handling of value type property accessKent Hansen2011-08-111-2/+4
| | | | | | | | | | | | 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>
* Remove initialization warningsGunnar Sletta2011-08-111-6/+6
| | | | | | | 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>
* Respect $$QT.declarative.binsRohan McGovern2011-08-112-2/+2
| | | | | | | | | | 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>
* Migrate part of QtScript benchmarks to QtDeclarativeJedrzej Nowacki2011-08-108-1/+2087
| | | | | | | | | 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>
* Code cleanup: unify QRegExp conversion.Jedrzej Nowacki2011-08-101-50/+1
| | | | | | | | | 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>
* Add missing check in QJSValue::propertyJedrzej Nowacki2011-08-101-0/+2
| | | | | | | | | 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>
* Code cleanup: unify string conversions.Jedrzej Nowacki2011-08-102-6/+5
| | | | | | | | | 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>
* Code cleanup.Jedrzej Nowacki2011-08-101-8/+10
| | | | | | | | | 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>
* Replace duplicated code by a function call.Jedrzej Nowacki2011-08-101-10/+1
| | | | | | | | | | 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>
* QSGDistanceFieldGlyphCache code refactoring.Yoann Lopes2011-08-1011-159/+210
| | | | | | | | 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>
* Add support for individual row and column spacing to Grid object.Glenn Watson2011-08-105-9/+142
| | | | | | | | | | | | | 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>
* Make distance field text more easily configurable.Yoann Lopes2011-08-093-19/+39
| | | | | | | | | | 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>
* Add documentationAlan Alpert2011-08-0945-303/+7859
| | | | | | | | | 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>
* Copy the docs for QtQuick 1Alan Alpert2011-08-09350-113/+25719
| | | | | | Change-Id: Iaaaaaaa13726fa471f94fc7f809911164df24544 Reviewed-on: http://codereview.qt.nokia.com/2755 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Revise QDeclarativeChangeSet.Andrew den Exter2011-08-083-816/+1002
| | | | | | | | | | 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>
* Add combustion to examples launcherAlan Alpert2011-08-081-0/+1
| | | | | | | 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>
* parse args earlierCharles Yin2011-08-081-3/+4
| | | | | | | 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>
* remove app bundle config for macCharles Yin2011-08-081-2/+4
| | | | | | | 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>
* Fix broken test (view did not have focus set)Bea Lam2011-08-081-0/+1
| | | | | | | 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>
* add dummy notify signals to remove warningsCharles Yin2011-08-081-3/+5
| | | | | | | 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>