summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge conflicts.Martin Smith2010-07-1359-1519/+1884
|\
| * Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| * Private variable cleanup.Michael Brasser2010-07-132-20/+18
| * wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-132-2/+9
| * Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-123-0/+46
| * Resetting bindings through debugger interfaceLasse Holmstedt2010-07-094-0/+44
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0920-1041/+61
| |\
| | * Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-092-3/+3
| | * doc improvementsBea Lam2010-07-092-5/+27
| | * Follow -> Behaviormae2010-07-088-1006/+2
| | * 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
| | * Remove Image::pixmap property. QML applications should useBea Lam2010-07-083-14/+5
| | * Update QmlChanges.txtBea Lam2010-07-081-0/+4
| * | 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-085-46/+263
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-081-12/+15
| |\
| | * Micro optimization in QML date/time formatting functions.Michael Brasser2010-07-081-12/+15
| * | Allow the debugger to modify method bodiesAaron Kennedy2010-07-086-35/+108
| |/
| * QML: Let the debugger now the name of embedded functions within a QML functionOlivier Goffart2010-07-071-1/+1
| * Added QDeclarativeSpringAnimationmae2010-07-078-2/+604
| * docsBea Lam2010-07-075-17/+23
| * Don't crash if drag.target has no parentItemMartin Jones2010-07-071-2/+2
| * QDeclarativeText optimization.Michael Brasser2010-07-072-2/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0712-70/+129
| |\
| | * Remove deprecated Flickable.flickDirectionMartin Jones2010-07-073-16/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-07-0618-685/+957
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-061-0/+1
| | | |\
| | | * | Changing currentIndex shouldn't cancel a flick unnecessarily.Martin Jones2010-07-062-24/+45
| | * | | doc improvementsBea Lam2010-07-067-30/+83
| * | | | Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-074-21/+29
| | |_|/ | |/| |
| * | | Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-061-0/+1
| | |/ | |/|
| * | Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-061-0/+9
| * | Export QDeclarativePixmapMartin Jones2010-07-061-1/+1
| * | docWarwick Allison2010-07-061-2/+2
| * | Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-051-3/+15
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0555-111/+140
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-051-3/+3
| | |\ \
| | | * | <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | | * | Optimize QDeclarativeStyledText.Michael Brasser2010-07-051-2/+0
| | * | | Work around QTBUG-11929Warwick Allison2010-07-051-1/+2
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0213-48/+69
| | |\ \ | | | |/
| | | * docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-028-28/+37
| | | |\
| | | | * Fix TextInput text getting improperly clippedJoona Petrell2010-07-022-19/+28
| | | | * fix doc linksBea Lam2010-07-026-7/+8
| | | | * Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-021-2/+1
generated by cgit v0.12 at 2024-11-25 20:34:19 (GMT)