Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename targets -> matchTargets and properties -> matchProperties. | Michael Brasser | 2009-11-06 | 56 | -166/+273 |
| | |||||
* | Update semantics of targets/properties and target/property. | Michael Brasser | 2009-11-06 | 6 | -68/+86 |
| | | | | | This is in preparation for renaming targets -> matchTargets and properties to matchProperties. | ||||
* | Fix bad merge. | Michael Brasser | 2009-11-05 | 1 | -2/+2 |
| | |||||
* | Another fix for the registration of the animations | Thierry Bastian | 2009-11-05 | 1 | -3/+4 |
| | |||||
* | Fix to the unregistration of the animation to the global timer | Thierry Bastian | 2009-11-05 | 1 | -19/+11 |
| | | | | | | | The unregistration has to happen befaire calling virtual methods to support changing the state in those functions. Reviewed-by: ogoffart | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-05 | 137 | -537/+6021 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | fix javascript errors in samegame tutorials | Yann Bodson | 2009-11-05 | 4 | -57/+102 |
| | | |||||
| * | qdoc3: Fixed a linking problem for qml methods. | Martin Smith | 2009-11-05 | 7 | -88/+152 |
| | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument. | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 6 | -17/+31 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 2 | -0/+10 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 15 | -27/+1253 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Test the currentSection property | Martin Jones | 2009-11-05 | 2 | -0/+10 |
| | | | | | |||||
| | * | | | Get tests passing on Mac | Alan Alpert | 2009-11-05 | 4 | -17/+21 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | There was inconsistent rounding of text widths. Task-number: QT-4200 QT-4201 | ||||
| * | | | QmlError test | Aaron Kennedy | 2009-11-05 | 4 | -0/+252 |
| | | | | |||||
| * | | | Tests | Aaron Kennedy | 2009-11-05 | 4 | -45/+231 |
| | | | | |||||
| * | | | More error-case tests | Aaron Kennedy | 2009-11-05 | 23 | -0/+82 |
| | | | | |||||
| * | | | Missing files for 8b40fac7e97a629ddaf1c0f6de2ebb504f004060 | Aaron Kennedy | 2009-11-05 | 10 | -0/+75 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 6 | -0/+831 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | QmlGraphicsparticles visual test | Alan Alpert | 2009-11-05 | 6 | -0/+831 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 9 | -27/+422 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | fix calculator | Yann Bodson | 2009-11-05 | 1 | -19/+15 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 52 | -340/+1922 |
| | |\ \ | | | |/ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 194 | -382/+13915 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 1048 | -40895/+32011 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Add tests for the the positioner transitions. | Alan Alpert | 2009-11-04 | 5 | -0/+363 |
| | | | | | | |||||
| | * | | | | Position items in the correct order | Alan Alpert | 2009-11-04 | 3 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nearly fixes QT-2241, but still waiting for a signal to appear in QGraphicsItem which allows up to reposition items after a change. | ||||
| | * | | | | Avoid crashing on faulty call to createQmlObject | Alan Alpert | 2009-11-03 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 32 | -68/+1454 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: tests/auto/declarative/valuetypes/testtypes.cpp | ||||
| | * | | | | Compile. | Martin Jones | 2009-11-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 27 | -44/+782 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 1 | -0/+21 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | | | | Document the vector3d type in QML | Rhys Weatherley | 2009-11-05 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5334 Reviewed-by: Aaron Kennedy | ||||
| | | * | | | | | Use darker() and lighter() functions from global Qt object rather than from ↵ | Yann Bodson | 2009-11-05 | 15 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemPalette. | ||||
| | | * | | | | | qmlsystempalette autotests | Yann Bodson | 2009-11-05 | 5 | -28/+171 |
| | | |/ / / / | |||||
| | | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 8 | -93/+272 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | | | fillmode visual test | Yann Bodson | 2009-11-05 | 6 | -0/+574 |
| | | | | | | | | |||||
| | * | | | | | | Add test for GridView, and fix bug. | Martin Jones | 2009-11-05 | 6 | -24/+672 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | value types autotest | Aaron Kennedy | 2009-11-05 | 4 | -27/+244 |
| |/ / / / / | |||||
| * | | | | | Add listview test file. | Martin Jones | 2009-11-05 | 1 | -0/+59 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 12 | -178/+195 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | update text visuals | Yann Bodson | 2009-11-05 | 6 | -174/+192 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 11 | -113/+282 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | | use FreeMono.ttf | Yann Bodson | 2009-11-05 | 6 | -4/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 194 | -382/+13915 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/graphicsitems/qmlgraphicsloader.cpp | ||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 11 | -1/+1573 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | | qmlgraphicstext visual tests | Yann Bodson | 2009-11-05 | 10 | -0/+1572 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 268 | -1754/+14883 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 11 | -113/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406 | ||||
| * | | | | | | Fix flicking endpoint adjustment with variable height items. | Martin Jones | 2009-11-05 | 2 | -48/+56 |
| | | | | | | |