Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 103 | -83/+13446 |
|\ | | | | | | | | | | | | | 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 | 10 | -0/+1572 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | qmlgraphicstext visual tests | Yann Bodson | 2009-11-05 | 10 | -0/+1572 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 175 | -1283/+14665 |
| |\ \ | | |/ | | | | | | | 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 | 7 | -45/+32 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-05 | 28 | -35/+757 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 6 | -40/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421 | ||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 52 | -43/+1096 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | Remove invalid test | Warwick Allison | 2009-11-04 | 1 | -5/+1 |
| | | | | | | |||||
| | * | | | | visual tests for borderimage | Yann Bodson | 2009-11-05 | 54 | -0/+10724 |
| | | | | | | |||||
| | * | | | | update rect visuals | Yann Bodson | 2009-11-05 | 2 | -0/+355 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 24 | -5/+678 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 1 | -5/+7 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | | QmlPropertyMap autotest update. | Michael Brasser | 2009-11-05 | 1 | -5/+7 |
| | | | | |/ | | | | |/| | |||||
| | | * | | | Partial valuetypes test | Aaron Kennedy | 2009-11-05 | 23 | -0/+671 |
| | | |/ / | |||||
| | * | | | more borderimage autotests | Yann Bodson | 2009-11-05 | 2 | -29/+69 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-04 | 88 | -1203/+2797 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | autotests | Yann Bodson | 2009-11-04 | 2 | -1/+10 |
| | | | | | |||||
| * | | | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 2 | -3/+6 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Loader cleanup and testing. | Martin Jones | 2009-11-05 | 1 | -3/+10 |
| | | | | |||||
* | | | | Test more ListView. | Martin Jones | 2009-11-05 | 1 | -0/+94 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-04 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-04 | 38 | -1161/+1806 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add missing file. | Michael Brasser | 2009-11-04 | 1 | -0/+11 |
| | | | | |||||
* | | | | declarative.pro update | Aaron Kennedy | 2009-11-04 | 1 | -33/+36 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-04 | 36 | -1160/+1701 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | docs (somewhere is better than nowhere) | Warwick Allison | 2009-11-04 | 1 | -1/+30 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 2 | -2/+70 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-04 | 4 | -5/+11 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Improve Loader tests | Martin Jones | 2009-11-04 | 2 | -2/+70 |
| | | |_|/ | | |/| | | |||||
| * | | | | Update visual tests (mae fixed line spacing) | Warwick Allison | 2009-11-04 | 29 | -1152/+1590 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 7 | -24/+277 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix test. | Warwick Allison | 2009-11-04 | 1 | -2/+6 |
| | | | | |||||
| * | | | Ensure root object is at least created. | Warwick Allison | 2009-11-04 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | Tweak for QTBUG-5296 (lots of other examples hang too though) | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-04 | 81 | -289/+2473 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-04 | 79 | -288/+2348 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | More XmlListModel tests. | Michael Brasser | 2009-11-04 | 5 | -23/+172 |
| | |/ | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 11 | -54/+401 |
| | |\ | | | | | | | | | | | | | 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-04 | 12 | -22/+206 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-04 | 2 | -0/+30 |
| | | | |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | Start on QmlXmlListModel autotest. | Michael Brasser | 2009-11-04 | 5 | -0/+154 |
| | | | | | | |||||
| | | | * | | Fix test after rename. | Michael Brasser | 2009-11-04 | 6 | -22/+22 |
| | | | | | | |||||
| | | * | | | more autotests | Yann Bodson | 2009-11-04 | 1 | -32/+225 |
| | | |/ / | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 24 | -4/+738 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Add closestAngle function to Qt object to help with rotation animations. | Alan Alpert | 2009-11-04 | 2 | -0/+30 |
| | | |/ | | | | | | | | | | | | | Includes test and doc. | ||||
| | | * | States autotest + missing files. | Michael Brasser | 2009-11-04 | 10 | -0/+351 |
| | | | | |||||
| | | * | DateTimeFormatter autotests. | Michael Brasser | 2009-11-04 | 1 | -0/+10 |
| | | | | |||||
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-04 | 5 | -0/+165 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | use same name for setter/getter and property | Yann Bodson | 2009-11-04 | 2 | -5/+5 |
| | | | | | |||||
| | * | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-04 | 52 | -229/+1402 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h |