Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge qmlengine and qmlbindengine tests | Aaron Kennedy | 2009-09-23 | 6 | -104/+80 |
| | |||||
* | Compile | Aaron Kennedy | 2009-09-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 10 | -37/+1033 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-09-23 | 11983 | -93596/+412581 |
| |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qml.pri | ||||
| * | | Add some of the functionality from the old debugger (e.g. dynamic updating ↵ | Bea Lam | 2009-09-23 | 10 | -37/+1033 |
| | | | | | | | | | | | | of property values, watch table, colouring of tree widget items). | ||||
* | | | Use .qml file extension in test | Aaron Kennedy | 2009-09-23 | 12 | -11/+11 |
| | | | |||||
* | | | Move test data into data/ subdir | Aaron Kennedy | 2009-09-23 | 13 | -1/+1 |
| |/ |/| | |||||
* | | vector -> Qt.vector3d | Aaron Kennedy | 2009-09-23 | 1 | -2/+0 |
| | | |||||
* | | Move test data into data subdir | Aaron Kennedy | 2009-09-23 | 128 | -3/+3 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 4 | -24/+44 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-23 | 96 | -1331/+1687 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix cursor drawing in QFxTextInput and QFxTextEdit | Alan Alpert | 2009-09-23 | 3 | -9/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug in QFxPaintedItem that was plaguing them both. Optimizes the painting of he blinking cursor in QFxTextInput (don't redraw whole thing each blink) Fixes cursor drawing and lack thereof bugs with QFxTextEdit. Task-number: QT-669 | ||||
| * | | | Fixing and refactoring of QFxLineInput updating | Alan Alpert | 2009-09-22 | 2 | -21/+34 |
| | | | | | | | | | | | | | | | | Still not working ideally. | ||||
* | | | | Use a bitmask to track bound properties | Aaron Kennedy | 2009-09-23 | 8 | -26/+95 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 24 | -129/+18 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-22 | 30 | -995/+1274 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Fix clipping bug in QFxText when text is larger than item's rect. | Andreas Aardal Hanssen | 2009-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply an intersect clip (don't replace the clip). Reviewed-by: Henrik Hartz | ||||
| | * | | | Fix crash in ~QmlEngine when using QmlDom | Kai Koehne | 2009-09-22 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlEngine keeps a pointer to QmlCompositeTypeData passed into QmlCompiler::compile. Therefore we have to also create QmlCompositeTypeData on the heap, and use reference counting. | ||||
| | * | | | Replace begin()/end() with constBegin()/constEnd() to avoid detach in | Marco Bubke | 2009-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~QmlEngine Reviewed-by: Kai Koehne | ||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Marco Bubke | 2009-09-22 | 78 | -1170/+1508 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Marco Bubke | 2009-09-21 | 2922 | -30300/+361820 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | | | add fix for view size change | Marco Bubke | 2009-09-17 | 1 | -8/+10 |
| | | | | | | | |||||
| * | | | | | | Replaced by testcases. | Warwick Allison | 2009-09-22 | 20 | -117/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was not a helpful example. | ||||
* | | | | | | | Add plumbing for more advanced signal property control | Aaron Kennedy | 2009-09-22 | 7 | -73/+200 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Slight simplification of parameterized signals | Aaron Kennedy | 2009-09-22 | 7 | -23/+45 |
| | | | | | | |||||
* | | | | | | Recording is now on F9 | Aaron Kennedy | 2009-09-22 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-22 | 35 | -178/+174 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-22 | 51 | -175/+244 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-09-22 | 48 | -171/+219 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-09-22 | 15 | -22/+68 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | | Renaming: QFxView -> QmlView | Yann Bodson | 2009-09-22 | 31 | -137/+137 |
| | | | |_|_|/ / | | | |/| | | | | |||||
| | * | | | | | | Particles no longer paints things itself. | Michael Brasser | 2009-09-22 | 1 | -2/+0 |
| | | | | | | | | |||||
| | * | | | | | | Fixes for framerate monitor. | Michael Brasser | 2009-09-22 | 3 | -2/+25 |
| | | | | | | | | |||||
| * | | | | | | | Clean up Same Game JS | Alan Alpert | 2009-09-22 | 1 | -37/+12 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Delayed loading is never used and is poorly implemented, so remove it. | ||||
* | | | | | | | Preliminary support for object and list synthesized property types | Aaron Kennedy | 2009-09-22 | 18 | -922/+1198 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-22 | 20 | -45/+88 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/snippets/declarative/repeater.qml | ||||
| * | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-22 | 2 | -12/+14 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Repeater doc update. | Yann Bodson | 2009-09-21 | 2 | -12/+14 |
| | |/ / / / | |||||
| * | | | | | import does not currently insist on a version, it should for these cases | Warwick Allison | 2009-09-22 | 5 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | (but not for non-installed local files) | ||||
| * | | | | | Syntax update | Warwick Allison | 2009-09-22 | 7 | -20/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id must not be a type Image::fillMode change | ||||
| * | | | | | Ensure absolute path for qmldir URL. | Warwick Allison | 2009-09-22 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Missing files. | Warwick Allison | 2009-09-22 | 2 | -0/+12 |
| |/ / / / | |||||
| * | | | | Fixed compile for example support library | Thorbjørn Lindeijer | 2009-09-21 | 3 | -11/+7 |
| | |/ / | |/| | | |||||
* | | | | Doc | Aaron Kennedy | 2009-09-22 | 1 | -3/+4 |
|/ / / | |||||
* | | | Fix example | Aaron Kennedy | 2009-09-21 | 1 | -2/+2 |
| | | | |||||
* | | | Allow paths to be excluded from test | Aaron Kennedy | 2009-09-21 | 1 | -0/+17 |
| | | | |||||
* | | | Rename samegame | Aaron Kennedy | 2009-09-21 | 1 | -0/+0 |
| | | | |||||
* | | | Rename samegame | Aaron Kennedy | 2009-09-21 | 1 | -0/+0 |
| | | | |||||
* | | | Add an autotest to ensure all our examples/demos launch | Aaron Kennedy | 2009-09-21 | 3 | -0/+147 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-21 | 2 | -23/+78 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |