Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-05 | 3 | -8/+19 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 8 | -142/+149 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 62 | -241/+408 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 32 | -488/+200 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Position items in the correct order | Alan Alpert | 2009-11-04 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -52/+40 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: tests/auto/declarative/valuetypes/testtypes.cpp | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 2 | -28/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | qmlsystempalette autotests | Yann Bodson | 2009-11-05 | 2 | -28/+11 |
| | | | | | | |||||
| * | | | | | Add test for GridView, and fix bug. | Martin Jones | 2009-11-05 | 2 | -24/+29 |
| |/ / / / | |||||
* | | | | | value types autotest | Aaron Kennedy | 2009-11-05 | 1 | -10/+10 |
|/ / / / | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-05 | 62 | -241/+408 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Fix signal overriding. | Michael Brasser | 2009-11-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 66 | -466/+209 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-05 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | 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 | 3 | -214/+0 |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | more borderimage autotests | Yann Bodson | 2009-11-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 55 | -144/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05 | 3 | -214/+0 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 5 | -102/+60 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Remove property-order sensitivity. | Warwick Allison | 2009-11-04 | 3 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes autotest. | ||||
| * | | | | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 5 | -90/+258 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
* | | | | | Loader cleanup and testing. | Martin Jones | 2009-11-05 | 3 | -42/+53 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-04 | 5 | -102/+60 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Missing file for 48ea5a5c74620f9811debc6bf1e49bf095d30722 | Aaron Kennedy | 2009-11-04 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-04 | 21 | -164/+109 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | tests | Aaron Kennedy | 2009-11-04 | 3 | -85/+38 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-04 | 4 | -8/+31 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Improve qmllanguage test case | Aaron Kennedy | 2009-11-04 | 1 | -14/+19 |
| | |_|/ | |/| | | |||||
* | | | | Remove IntegerModel. model properties accept an integer. | Martin Jones | 2009-11-04 | 3 | -214/+0 |
| |_|/ |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-04 | 3 | -107/+20 |
|\ \ \ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-04 | 16 | -140/+68 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 1 | -0/+3 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Remove support for removed effects. | Warwick Allison | 2009-11-04 | 1 | -97/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | See d576d770b9b8251f1b5b4808a84045af33e62dba | ||||
| * | | | | | More listview testing and fixing. | Martin Jones | 2009-11-04 | 2 | -10/+20 |
| | |_|_|/ | |/| | | | |||||
* | | | | | less compile warnings | Yann Bodson | 2009-11-04 | 3 | -14/+21 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-04 | 2 | -0/+21 |
|\ \ \ \ | | |/ / | |/| | | | | | | 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/+21 |
| | | | | | | | | | | | | | | | | Includes test and doc. | ||||
* | | | | Doc. | Michael Brasser | 2009-11-04 | 1 | -0/+3 |
|/ / / | |||||
* | | | Rename QmlGraphicsPixmapCache to QmlPixmapCache. | Michael Brasser | 2009-11-04 | 8 | -34/+35 |
| | | | |||||
* | | | use same name for setter/getter and property | Yann Bodson | 2009-11-04 | 4 | -9/+9 |
|/ / | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-04 | 3 | -3/+5 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-03 | 2 | -1/+3 |
| |\ \ | | | | | | | | | | | | | 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-03 | 1 | -1/+1 |
| | |\ \ | | | |/ | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Fix incorrect assert | Aaron Kennedy | 2009-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | QT-2432 | ||||
| | * | | more qmlfontloader tests | Yann Bodson | 2009-11-03 | 1 | -0/+2 |
| | |/ | |||||
| * | | Don't rely on imprecise boundingRect for space around text for outlines. | Warwick Allison | 2009-11-03 | 1 | -2/+2 |
| |/ | | | | | | | Fixes tst_visual(flickable) | ||||
* | | Fix moving items in visual item model. | Martin Jones | 2009-11-04 | 2 | -6/+27 |
|/ |