Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-26 | 1 | -0/+0 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-26 | 6 | -20/+48 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Crop whitespace from image. | Martin Jones | 2009-11-26 | 1 | -0/+0 |
| | | | | | | | | | | | | Task-number: QT-2384 | ||||
* | | | Doc fixes | Bea Lam | 2009-11-26 | 2 | -1/+5 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-26 | 3 | -0/+28 |
|\ \ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | Doc. | Michael Brasser | 2009-11-26 | 1 | -0/+17 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-26 | 27 | -61/+1045 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Ensure running is set to false when the timer stops. | Martin Jones | 2009-11-26 | 2 | -0/+11 |
| | | | |||||
* | | | doc fixes | Bea Lam | 2009-11-26 | 5 | -20/+31 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-25 | 23 | -9/+1029 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | added a snake demo | mae | 2009-11-25 | 22 | -0/+1019 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-25 | 41 | -203/+494 |
| |\ \ | | |/ | | | | | | | into kinetic-declarativeui | ||||
| * | | Doc | Aaron Kennedy | 2009-11-25 | 1 | -9/+10 |
| | | | |||||
* | | | Treat emissionRate=0 like emitting=false | Alan Alpert | 2009-11-25 | 4 | -52/+16 |
| |/ |/| | | | | | | | | | | | | | Including stopping the timer because we arenæt emitting anything. Because emissionRate=0 is exactly the same as emitting=false, the emitting property has been removed. Task-number: QTBUG-6209 | ||||
* | | Small doc fixes. | Martin Jones | 2009-11-25 | 10 | -23/+27 |
| | | |||||
* | | Add reset function for anchors.fill and anchors.centerIn. | Michael Brasser | 2009-11-25 | 3 | -2/+38 |
| | | | | | | | | Task-number: QTBUG-5337 | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-25 | 10 | -73/+107 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-25 | 21 | -92/+292 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: doc/src/declarative/extending.qdoc | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-25 | 13 | -41/+235 |
| | |\ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | slideswitch example fixes | Yann Bodson | 2009-11-25 | 2 | -3/+6 |
| | | | | | |||||
| | * | | | add target | Yann Bodson | 2009-11-25 | 1 | -19/+20 |
| | | | | | |||||
| | * | | | use right type | Yann Bodson | 2009-11-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Doc improvments | Bea Lam | 2009-11-25 | 7 | -50/+79 |
| | | | | | |||||
* | | | | | Notify of any change to pixmap property. | Martin Jones | 2009-11-25 | 3 | -1/+4 |
| |_|/ / |/| | | | |||||
* | | | | Add Timer reset() method. | Martin Jones | 2009-11-25 | 3 | -0/+41 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-25 | 4 | -20/+57 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Add NOTIFYs for anchor properties. | Michael Brasser | 2009-11-25 | 3 | -19/+54 |
| | | | | | | | | | | | | | | | | | | | | Requested for Bauhaus. | ||||
| * | | | | Make sure initial state gets set correctly. | Michael Brasser | 2009-11-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Fixes regression introduced by 3ec86e388a35b850573b8fd8b58c93113bb8bd3. | ||||
* | | | | | Test for pixmap property of Image. | Martin Jones | 2009-11-25 | 2 | -0/+31 |
|/ / / / | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-25 | 13 | -74/+135 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-25 | 27 | -185/+358 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | 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-25 | 6 | -38/+57 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-25 | 10 | -70/+134 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | Doc improvements | Bea Lam | 2009-11-25 | 4 | -37/+54 |
| | | | | | | |||||
| | * | | | | cleanup progressbar example | Yann Bodson | 2009-11-25 | 5 | -28/+29 |
| | | |_|/ | | |/| | | |||||
| * | | | | If zooming on nothing, zoom 2x rather than doing nothing. | Warwick Allison | 2009-11-25 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Allow dragging be press and hold, in which case don't let Flickable take the ↵ | Warwick Allison | 2009-11-25 | 2 | -7/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag. When not press-and-hold, don't pass drags to WebKit. | ||||
| * | | | | Fix memory leak | Warwick Allison | 2009-11-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | QTBUG-6156 | ||||
* | | | | | Fix changing Timer interval while running. | Martin Jones | 2009-11-25 | 3 | -12/+54 |
| |_|_|/ |/| | | | | | | | | | | | Task-number: QTBUG-6201 | ||||
* | | | | Add NOTIFY signal for Image.pixmap | Martin Jones | 2009-11-25 | 2 | -1/+3 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-24 | 4 | -63/+108 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-24 | 6 | -26/+117 |
| |\ \ \ | | | |/ | | |/| | | | | | into kinetic-declarativeui | ||||
| * | | | Doc | Aaron Kennedy | 2009-11-24 | 4 | -63/+108 |
| | | | | |||||
* | | | | Docs. | Martin Jones | 2009-11-24 | 2 | -1/+10 |
| | | | | |||||
* | | | | Fix GridView drag beyond end resistance. | Martin Jones | 2009-11-24 | 2 | -4/+12 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-24 | 24 | -71/+349 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-24 | 5 | -8/+89 |
| |\ \ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-11-24 | 3 | -24/+24 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | Prevent state changes within PropertyChanges. | Michael Brasser | 2009-11-24 | 5 | -8/+89 |
| | | |/ | | |/| | | | | | | | | | Task-number: QT-2358 | ||||
| * | | | Fix doc example code | Bea Lam | 2009-11-24 | 1 | -18/+28 |
| | |/ | |/| |