aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix v8 handle management in QSGLoaderChris Adams2011-10-072-1/+7
| | | | | | | | | | | | | | | | Previously, setting the source to a remote url and specified some initial property values while active was false, and then setting active to true, would cause undefined behaviour. This commit ensures that the handles are managed correctly, and that an appropriate v8 context exists during object creation with initial property values specified. Task-number: QTBUG-21868 Change-Id: I101c6546537aa05aaeb420195aca670bc71f31e1 Reviewed-on: http://codereview.qt-project.org/6109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Debugger: Call removeEngine also for QV8DebugServiceKai Koehne2011-10-061-0/+1
| | | | | | | Change-Id: Ibb35e577f8844b47a844864f7639321859e20866 Reviewed-on: http://codereview.qt-project.org/6171 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix missing inline imagesEskil Abrahamsen Blomfeldt2011-10-061-2/+1
| | | | | | | | | | | | | | Oops, the change to support floating images caused a regression, as it caused all images represented by object replacement characters to be ignored instead of only the ones that were floating and were handled elsewhere. The correct test is less strict, only verifying that the layout position is InFlow. Change-Id: Ib28ea595b598bbd047eebe1a704211f0ba139382 Reviewed-on: http://codereview.qt-project.org/6074 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* QV8Profiler serviceChristiaan Janssen2011-10-066-1/+417
| | | | | | | | | | Expose the v8 profiler API through the declarative debugging infrastructure. The client side is implemented in Qt Creator. Change-Id: Idf4f3338d2e6756e7774f0704c0e5c4b35b0ed35 Reviewed-on: http://codereview.qt-project.org/5893 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix QJSEngine::newQObject ownership behaviourSimon Hausmann2011-10-062-1/+20
| | | | | | | | | | | | | | Ensure the indestructible flag is set to false for objects wrapped through QJSEngine::newQObject, to ensure that they get deleted upon gc when they don't have a parent. Re-enabled the QJSEngine::garbageCollect and ownership auto-tests that verified this behaviour. Change-Id: I181bff0cc44d071d650a2f73494e49cce6ad538e Reviewed-on: http://codereview.qt-project.org/2398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add a get function to VisualDataGroup.Andrew den Exter2011-10-063-13/+240
| | | | | | | | | | | | | This returns an object with properties for accessing the model data of an item, membership in the visual data model's groups and the index of the item in each group. Task-number: QTBUG-21512 Change-Id: I878442c8a2e30cc6f9941f7412303581613a6142 Reviewed-on: http://codereview.qt-project.org/5515 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Ensure view delegates are object parented to the contentItemMartin Jones2011-10-061-0/+2
| | | | | | | | | | Caused a leak which resulted in persistent v8 handles not being disposed. Change-Id: I5c10ff619531976ab61d9ce1ff8327c4a40cfd5e Reviewed-on: http://codereview.qt-project.org/6112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix for qsgtext autotestsYann Bodson2011-10-061-1/+4
| | | | | | | Change-Id: If02d4cb69b4f729b85b47222c17a0b1642e649fb Reviewed-on: http://codereview.qt-project.org/6111 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't call componentComplete() on a VDM until its view is complete.Andrew den Exter2011-10-064-2/+27
| | | | | | | | | | This is more consistent with the behaviour you get when constructing a VisualDataModel explicitly. Change-Id: I33e32c7747ff3153449a88b9c7d894807e7e4b9a Reviewed-on: http://codereview.qt-project.org/6014 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* add canvas drawImage unit testsCharles Yin2011-10-061-11/+29
| | | | | | | Change-Id: I772bf58bead4b536cc632983846743e0d576bedd Reviewed-on: http://codereview.qt-project.org/6100 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* QSGLoader shouldn't load component when active is falseChris Adams2011-10-062-14/+16
| | | | | | | | | | | | | Previously, QSGLoader still loaded the component specified, but didn't instantiate the item. This commit ensures that no component is loaded from the source, and that the onLoaded signal is emitted only when loading occurs (when the loader is active). Task-number: QTBUG-21710 Change-Id: I2d83603ef84d6942fb84141e9e146d2cf9654fc4 Reviewed-on: http://codereview.qt-project.org/5915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Allow incubators to be driven recursivelyAaron Kennedy2011-10-066-8/+148
| | | | | | Change-Id: If8ce239372c3cf3166b666329ba812b25ee54669 Reviewed-on: http://codereview.qt-project.org/6102 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Always delete object if incubator is cancelledAaron Kennedy2011-10-061-0/+2
| | | | | | | Change-Id: Iad04340bac9d1345069e540e6bf9dbf671ce9226 Reviewed-on: http://codereview.qt-project.org/6088 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add JavaScript "var" property type to QMLChris Adams2011-10-0612-90/+332
| | | | | | | | | | | This commit adds a new syntax which allows "var" type properties which can have JavaScript objects (as well as other basic types) assigned to them. Such JavaScript objects cannot be bound to. Task-number: QMLNG-18 Change-Id: If7f5045f4669e0d5c1b8d0891ed765128d0bc1c6 Reviewed-on: http://codereview.qt-project.org/1466 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add support for filtering VisualDataModels.Andrew den Exter2011-10-068-222/+3256
| | | | | | | | | | | | | | | | | Add a VisualDataGroup element which items within a VisualDataModel can be assigned to. Setting the group property of a VisualDataModel or one of its parts models will filter the items visible within a view to just items belonging to that group. By default all items belong to an 'items' group. The VisualDataModel attached object includes properties indicating whether a item is a member of a group and its index in the group. Task-number: QTBUG-21513 QTBUG-21515 Change-Id: If3df6a359a888a6f79923775d2f78076d5e7d2cf Reviewed-on: http://codereview.qt-project.org/4115 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add more unit tests for qsgcanvasitem and fix unstable testsCharles Yin2011-10-065-223/+394
| | | | | | | Change-Id:I5fc11a5874d55ad423dc1fb9c3e1b75a38003465 Reviewed-on: http://codereview.qt-project.org/5962 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Don't overwrite block formats in QSGTextEskil Abrahamsen Blomfeldt2011-10-051-1/+1
| | | | | | | | | | | When QSGText has rich text, we need to retain the block formats already in the document instead of overwriting them. E.g. lists would not work because of this bug. Change-Id: I4cdae55e2358950a330c61613b5fd41e1986dc13 Reviewed-on: http://codereview.qt-project.org/6059 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Don't accidentally use atlas images in particle nodesGunnar Sletta2011-10-052-2/+9
| | | | | | | Change-Id: I3058d9262bbc32c873ba26e51b04668f89ed060a Reviewed-on: http://codereview.qt-project.org/6039 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix floating images in QSGTextNodeEskil Abrahamsen Blomfeldt2011-10-051-10/+16
| | | | | | | | | | | | | | When images are floating and we encounter the object replacement character, we should ignore them, as they're done by special handling of the QTextFrame. We also need to make sure they are not attempted inlined by passing the layout position of the frame to addTextObject(), and we need to set a valid QTextLine for the object to make sure it's added to the graph. Change-Id: Ia43ef3fd4bb9c7b48e0862071118ee0f176212bd Reviewed-on: http://codereview.qt-project.org/6036 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Make sure the Image texture provider does not return an atlassed textureGunnar Sletta2011-10-053-3/+30
| | | | | | | | | | | | | | | | | | This has the implication that textures from texture providers are always the complete texture with coordinates from 0-1, which is means we get a copy for atlas textures which may end up affecting performance. Alternatives are: - ShaderEffect does this, which means texture providers can provide atlas textures. - We expose the subrect to ShaderEffect, which means an API change in all shader effect classes, and let the vertex shader solve this. Worst API, fastest and most memory efficient. Change-Id: Id58eb866f315012637345a6f731626abf4a7a86c Reviewed-on: http://codereview.qt-project.org/6029 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Support atlased textures in QSGNinePatchNodeGunnar Sletta2011-10-052-15/+22
| | | | | | | Change-Id: I0433d15c22d0f7b9de2d5a5590f51a554e56a912 Reviewed-on: http://codereview.qt-project.org/6028 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* V8Debugger: Code beautificationKai Koehne2011-10-053-44/+38
| | | | | | | | | | Convert to from QString to QByteArray only when necessary. Also move private methods into private class. Change-Id: Iac28990f16c588e0172356c9395b7771f01f4817 Reviewed-on: http://codereview.qt-project.org/6022 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Ensure all persistent handles are disposed properlyChris Adams2011-10-053-1/+7
| | | | | | | | | | Previously, some handles were leaking, which was causing a dramatic slowdown in v8 gc speed over time. Change-Id: I1e8d674b48647b7a0063a4b1c8d83130795502a0 Reviewed-on: http://codereview.qt-project.org/6026 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Set isRoot correctly for value typesAaron Kennedy2011-10-051-5/+16
| | | | | | | Change-Id: I1ddbe5a76fd804df51a3feaf1c0a9004a67abf9f Reviewed-on: http://codereview.qt-project.org/6023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Declarative: Compile on Windows.Friedemann Kleint2011-10-053-6/+9
| | | | | | | | | | Initial-patch-by: Kent Hansen <kent.hansen@nokia.com> Change-Id: Ieb7ff0537b641597fd0334ae1cb359f89c45ad50 Reviewed-on: http://codereview.qt-project.org/5871 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Sprites can now have varying width and heightAlan Alpert2011-10-059-61/+120
| | | | | | | | | | | | | Varying between Sprites, or between width and height, not within a single Sprite. For ImageParticle only, SpriteImage changes will be in a later commit. Also adds spriteInterpolation boolean. Change-Id: I80681e44f26985a6f6a6b83bd162f6231c7f28c4 Reviewed-on: http://codereview.qt-project.org/6002 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Split GroupGoal out of SpriteGoalAlan Alpert2011-10-057-7/+240
| | | | | | | | | | Leaving SpriteGoal alone for a few weeks with a deprecation message, but a functioning GroupGoal has been added. Change-Id: I395046c00526e7caa38bdbc499a8191308c476fa Reviewed-on: http://codereview.qt-project.org/5950 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Missed a spot when refactoring activeGroupAlan Alpert2011-10-051-1/+1
| | | | | | | Change-Id: Ia6b884557876efb98ab1e0785102cd81de9bbbed Reviewed-on: http://codereview.qt-project.org/5966 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QCoreApplication to get the qml debug argumentsKent Hansen2011-10-041-2/+2
| | | | | | | | | | | | The debug arguments string was moved from QApplication to QCoreApplication as part of the Qt refactor/library split, so there's no need to depend on QGuiApplication. Change-Id: I0eb87be318b80290be656d707e3d38020f765a90 Reviewed-on: http://codereview.qt-project.org/5883 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Initialize members in the right orderKent Hansen2011-10-041-1/+1
| | | | | | | | | ... to fix compiler warning. Change-Id: I3328d17b498b22d9c8703d0f034b3b9f944c1b17 Reviewed-on: http://codereview.qt-project.org/5880 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* more debugGunnar Sletta2011-10-041-0/+3
| | | | | | | Change-Id: I49c76424bd987059e74c0f13826d3ca7dd07e7ef Reviewed-on: http://codereview.qt-project.org/5967 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Add debug description to QSGDistanceFieldGlyphNodeGunnar Sletta2011-10-041-0/+3
| | | | | | | Change-Id: If66482f6e00bfade2da3b9067ff51ef782cd486e Reviewed-on: http://codereview.qt-project.org/5849 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* move depth logic out of QSGRendererGunnar Sletta2011-10-042-3/+3
| | | | | | | Change-Id: I1fc3baf858664ea9648922204fa0e4d5ca64d740 Reviewed-on: http://codereview.qt-project.org/5848 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Have textureId() return the correct value and document this behaviorGunnar Sletta2011-10-042-5/+34
| | | | | | | Change-Id: Ia75b5fc3b6c9f15bb15e8850295c33ba32a485f1 Reviewed-on: http://codereview.qt-project.org/5970 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* (private-) export of QSGShaderEffectSource.juhvu2011-10-041-1/+1
| | | | | | | | | | | | | | | | QtLocation maps need to be able to render standard QML elements as Map items (for example a convenience store logo and text). Prior to Qt5 this was achieved with Qt graphics view framework. Only really private symbol used, in addition to inheriting a class from QSGShaderEffectSource, is textureProvider(). It is used to access texture IDs, which can then be used to map textures to map item geometries. Change-Id: Ifc6cf1d20b11493738c77b3bde9972a8cb1c70ce Reviewed-on: http://codereview.qt-project.org/5912 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QDeclarativeIncubator autotestsAaron Kennedy2011-10-041-2/+27
| | | | | | | | Change-Id: Ib1b70903c5aa82fc1112c17db1b676b4740ea685 Task-number: QTBUG-21151 Reviewed-on: http://codereview.qt-project.org/5940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix incorrect index when accumulating multiple removes.Andrew den Exter2011-10-041-5/+3
| | | | | | | | | | Don't remove the intersecting count from the current remove twice, and accumulate consecutive not just overlapping removes. Change-Id: I426d764d980ee17ad114aa03ca4089da89c6aed2 Reviewed-on: http://codereview.qt-project.org/5902 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Exported QSGMouseArea and QSGMouseEvent as private exports.juhvu2011-10-042-2/+4
| | | | | | | | | | | | | | | | | | | | | | QtLocation uses QSGMouseAreas internally in the MapMouseArea and MapMouse event (it can't support standard MouseAreas due to its domain specific requirements). Exporting those classes as private exports will enable significant code re-use. Dependencies on privates of other modules is never ideal, but it is notable that MapMouseAreas use only the public properties of the QSGMouse classes. Exports are needed to be able to instantiate them as well as to connect to their property signals (and work without reinterpret casts). (Copying QSGMouse classes to QtLocation is not practical they are very intertwined with QSG internals). Change-Id: I98651f9d525abc3b7319e027e47c71b3e3c5fe51 Reviewed-on: http://codereview.qt-project.org/5352 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow .pragma library scripts to import other scriptsChris Adams2011-10-041-1/+5
| | | | | | | | | | | | | | | | | | | Previously, a .pragma library script would have a new context which did not have an engine set. If the script then imported other scripts a crash would occur due to dereferencing the (null) engine ptr. This commit ensures that even if no parent context is used (eg, for shared scripts which don't import the parent context) the engine from the parent context is used as the engine in the new context. Finally, unit tests for the .pragma library import with imports cases were added to tst_qdeclarativeecmascript. Task-number: QTBUG-21620 Change-Id: I671ffc9eee98a69cce7c169ce5b9d5aae4d1ff0d Reviewed-on: http://codereview.qt-project.org/5421 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* use QWindows's format so users can overrideGunnar Sletta2011-10-031-1/+1
| | | | | | | Change-Id: I3dd2d1ff63acb672ef4943cf8347c5c10f2d9466 Reviewed-on: http://codereview.qt-project.org/5847 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QDeclarativeIncubator::clear() and autotestsAaron Kennedy2011-10-034-26/+155
| | | | | | | Change-Id: I2a14c01c7f9412459572e9960cb95a4c24e068aa Task-number: QTBUG-21151 Reviewed-on: http://codereview.qt-project.org/5911 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Don't draw itty-bitty particlesAlan Alpert2011-10-031-0/+5
| | | | | | | | | | They look terrible when rounding errors catch up. Jerky movement and flickering between N and N+1 square pixels when rendered. Change-Id: Id27caa38de70a10537382962cc29a0f1254a91fc Reviewed-on: http://codereview.qt-project.org/4949 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't layout while applying model changesBea Lam2011-10-031-0/+3
| | | | | | | | Task-number: QTBUG-21742 Change-Id: I0e01b9ac9f033108410ccd431329dd7d50edb8f2 Reviewed-on: http://codereview.qt-project.org/5903 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* currentIndex not updated correctly if list is initially emptyBea Lam2011-10-031-2/+5
| | | | | | | | | | | The currentIndex shouldn't be incremented when itemCount == 0 and also it should be default to 0 after the first item is added. Task-number: QTBUG-21643 Change-Id: Ia9418c0cd1cd659410123394c880dfe72557fa16 Reviewed-on: http://codereview.qt-project.org/5768 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initial commit of particle system autotestsAlan Alpert2011-10-035-8/+21
| | | | | | | | | Just some basic autotests for most of the elements. Change-Id: I2d289f38f362a38c69e03ff92154c98db3c4c486 Reviewed-on: http://codereview.qt-project.org/5844 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix order of QSGItem mouse filtering.Martin Jones2011-10-031-3/+3
| | | | | | | | | | | | QGraphicsView filtered child items beginning with the item's parent, grandparent, greatgrandparent... QSGCanvas did the opposite, which breaks the QML mouse handling element filtering logic. Task-number: QTBUG-21446 Change-Id: I18e125305eef536237195895a7f41f88b532d4aa Reviewed-on: http://codereview.qt-project.org/5819 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Don't move content forwards when items are moved downBea Lam2011-10-033-2/+17
| | | | | | | | | | | | | | | | | | | | Previously, if items moved down within a view, the content position would effectively drop down. E.g. for a (0,5,3) move that moved 3 items from 0 to 5, the content y would move to the position of index 3, since it became the new first item. However, this makes it difficult to move transitions for move() operations in these cases since these items do not move (since the content position moves instead). With this fix, the content position does not move, and items will always move if they are moved. Note this behaviour was previously implemented for backwards movements, e.g. a (5,0,3) move but was not enabled for a forwards (0,5,3) move. Change-Id: I1c5a19e3c36347a4aa0cf6e31c975967a7eeada9 Reviewed-on: http://codereview.qt-project.org/5576 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Declarative: Compile fix for Windows.Friedemann Kleint2011-10-022-2/+9
| | | | | | | Change-Id: I0e4d61aa400094b3b059c836ee9145c1af989f00 Reviewed-on: http://codereview.qt-project.org/5881 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Include the textureid/glyph cache in the material sortingGunnar Sletta2011-09-301-0/+2
| | | | | | | Change-Id: Ic9740081e9e0e53801bbda64f6b147ab74102663 Reviewed-on: http://codereview.qt-project.org/5887 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Declarative: Fix ASCII conversion warnings.Friedemann Kleint2011-09-306-26/+30
| | | | | | | Change-Id: Ide43c1e37eeda8e5dc2c2d24b99c3b4f96e1b53e Reviewed-on: http://codereview.qt-project.org/5867 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 19:01:11 +0000