summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-2813-313/+501
|\
| * Document that animations have to be started/stopped as a groupBea Lam2010-07-271-0/+8
| * various doc fixesBea Lam2010-07-272-8/+7
| * Fixes undeleted timers (and endless warning from the event loop aboutAaron Kennedy2010-07-231-1/+1
| * Remove unneeded member variable.Michael Brasser2010-07-222-6/+3
| * Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-222-11/+12
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-212-3/+7
| |\
| | * Only ignore the same target value for a Behavior when it is running.Michael Brasser2010-07-211-1/+1
| | * Rewinding AnchorChanges should not make target item's implicit width and heig...Joona Petrell2010-07-211-2/+6
| * | Ensure redirects (and indeed all reply process) is done in the right thread.Warwick Allison2010-07-211-23/+32
| |/
| * various doc improvements for animation elementsBea Lam2010-07-205-178/+190
| * Doc error fixes.Martin Jones2010-07-191-1/+1
| * PathView doc clarification.Martin Jones2010-07-191-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-165-102/+260
| |\
| | * fixes, improvements for various docs and example codeBea Lam2010-07-165-102/+257
| | * Minor animation doc improvementMartin Jones2010-07-161-0/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-141-1/+1
| |\ \ | | |/ | |/|
| | * Fixing merge conflicts.Martin Smith2010-07-1318-1102/+1021
| | |\
| | * | doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-091-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-1534-1137/+1087
|\ \ \ \ | |/ / /
| * | | improvements to docs and examplesBea Lam2010-07-142-6/+13
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0913-1020/+23
| |\ \
| | * | Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-092-3/+3
| | * | Follow -> Behaviormae2010-07-086-1004/+0
| | * | Added some documentation to spring animationmae2010-07-081-0/+9
| | * | Fix spring animationmae2010-07-081-1/+3
| | * | Optimization: change signal/slot to function callmae2010-07-084-10/+7
| | * | Don't show warning for attempts to load pixmaps asynchronouslyBea Lam2010-07-081-2/+1
| * | | Fix crash with invalid role indexesAaron Kennedy2010-07-091-0/+2
| |/ /
| * | Don't double delete cancelled pixmap cache requestsAaron Kennedy2010-07-081-3/+9
| * | Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-081-18/+67
| * | Added QDeclarativeSpringAnimationmae2010-07-078-2/+604
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-07-063-475/+731
| |\ \
| | * | Export QDeclarativePixmapMartin Jones2010-07-061-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0516-21/+21
| | |\ \
| | | * | <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | | * | Optimize QDeclarativeStyledText.Michael Brasser2010-07-051-2/+0
| | * | | Make declarative pixmap cache easier to useAaron Kennedy2010-07-052-472/+728
| * | | | doc improvementsBea Lam2010-07-063-26/+27
| | |/ / | |/| |
| * | | fix doc linksBea Lam2010-07-022-2/+2
| | |/ | |/|
| * | Remove a few more unnecessary exports.Martin Jones2010-07-011-3/+3
| * | Don't export declarative private classesMartin Jones2010-07-0112-13/+13
| |/
| * Docs - add more links to relevant examplesBea Lam2010-06-305-3/+7
| * Plug QdeclarativePixmapCache canceled request leak.Martin Jones2010-06-301-27/+29
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-251-0/+3
| |\
| | * Allow custom parsers to handle attached propertiesAaron Kennedy2010-06-251-0/+3
| * | Test ListElement type via type system, not string comparison.Warwick Allison2010-06-252-3/+10
| |/
| * Prevent value source animations from being registered to start twice.Michael Brasser2010-06-241-0/+2
| * Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-0121-304/+494
|\ \ | |/