summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-261-0/+0
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-266-20/+48
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Crop whitespace from image.Martin Jones2009-11-261-0/+0
| | | | | | | | | | | | Task-number: QT-2384
* | | Doc fixesBea Lam2009-11-262-1/+5
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-263-0/+28
|\ \ | | | | | | | | | into kinetic-declarativeui
| * | Doc.Michael Brasser2009-11-261-0/+17
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-2627-61/+1045
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Ensure running is set to false when the timer stops.Martin Jones2009-11-262-0/+11
| | |
* | | doc fixesBea Lam2009-11-265-20/+31
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-2523-9/+1029
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | added a snake demomae2009-11-2522-0/+1019
| | |
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-2541-203/+494
| |\ \ | | |/ | | | | | | into kinetic-declarativeui
| * | DocAaron Kennedy2009-11-251-9/+10
| | |
* | | Treat emissionRate=0 like emitting=falseAlan Alpert2009-11-254-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 Jones2009-11-2510-23/+27
| |
* | Add reset function for anchors.fill and anchors.centerIn.Michael Brasser2009-11-253-2/+38
| | | | | | | | Task-number: QTBUG-5337
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-2510-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 Lam2009-11-2521-92/+292
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: doc/src/declarative/extending.qdoc
| | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-2513-41/+235
| | |\ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | slideswitch example fixesYann Bodson2009-11-252-3/+6
| | | | |
| | * | | add targetYann Bodson2009-11-251-19/+20
| | | | |
| | * | | use right typeYann Bodson2009-11-251-1/+1
| | | | |
| * | | | Doc improvmentsBea Lam2009-11-257-50/+79
| | | | |
* | | | | Notify of any change to pixmap property.Martin Jones2009-11-253-1/+4
| |_|/ / |/| | |
* | | | Add Timer reset() method.Martin Jones2009-11-253-0/+41
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-254-20/+57
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Add NOTIFYs for anchor properties.Michael Brasser2009-11-253-19/+54
| | | | | | | | | | | | | | | | | | | | Requested for Bauhaus.
| * | | | Make sure initial state gets set correctly.Michael Brasser2009-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | Fixes regression introduced by 3ec86e388a35b850573b8fd8b58c93113bb8bd3.
* | | | | Test for pixmap property of Image.Martin Jones2009-11-252-0/+31
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-2513-74/+135
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-2527-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 Bodson2009-11-256-38/+57
| | |\ \ \ | | | |/ / | | | | | | | | | | into kinetic-declarativeui
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-2510-70/+134
| | | |\ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * | | Doc improvementsBea Lam2009-11-254-37/+54
| | | | | |
| | * | | | cleanup progressbar exampleYann Bodson2009-11-255-28/+29
| | | |_|/ | | |/| |
| * | | | If zooming on nothing, zoom 2x rather than doing nothing.Warwick Allison2009-11-251-0/+2
| | | | |
| * | | | Allow dragging be press and hold, in which case don't let Flickable take the ↵Warwick Allison2009-11-252-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag. When not press-and-hold, don't pass drags to WebKit.
| * | | | Fix memory leakWarwick Allison2009-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | QTBUG-6156
* | | | | Fix changing Timer interval while running.Martin Jones2009-11-253-12/+54
| |_|_|/ |/| | | | | | | | | | | Task-number: QTBUG-6201
* | | | Add NOTIFY signal for Image.pixmapMartin Jones2009-11-252-1/+3
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-244-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 Kennedy2009-11-246-26/+117
| |\ \ \ | | | |/ | | |/| | | | | into kinetic-declarativeui
| * | | DocAaron Kennedy2009-11-244-63/+108
| | | |
* | | | Docs.Martin Jones2009-11-242-1/+10
| | | |
* | | | Fix GridView drag beyond end resistance.Martin Jones2009-11-242-4/+12
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-2424-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 Lam2009-11-245-8/+89
| |\ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-243-24/+24
| | |\ \ \ | | | |/ / | | | | | | | | | | into kinetic-declarativeui
| | * | | Prevent state changes within PropertyChanges.Michael Brasser2009-11-245-8/+89
| | | |/ | | |/| | | | | | | | | Task-number: QT-2358
| * | | Fix doc example codeBea Lam2009-11-241-18/+28
| | |/ | |/|