summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation after mergeOlivier Goffart2010-07-151-10/+10
| | | | | | viewport has been renamed contentItem in 4.7 (commit 9d6ccfea89ae99b747f70ece71185868f189d0f9) (the code in master was added in commit 8c08c737837389f5ff2641219eb901ad217d3f24)
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-15117-2135/+3055
|\ | | | | | | | | Conflicts: src/gui/kernel/qapplication.h
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-142-3/+9
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1413-378/+464
| | |\
| | * | Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-142-3/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-12167
| * | | Check for binding having been deleted in more placesAaron Kennedy2010-07-141-0/+6
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-147-48/+69
| |\ \
| | * | improvements to docs and examplesBea Lam2010-07-146-47/+63
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-131-0/+4
| | |\
| | * | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Happened when currentItem was on a section boundary. Task-number: QTBUG-12089
| * | | Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-147-331/+401
| | |/ | |/|
| * | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| |/ | | | | | | | | Task-number: QTBUG-12115 Reviewed-by: Martin Jones
| * 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
| | | | | | | | | | | | | | | | Ancestors of the item with focus should only report wantsFocus as true when they are a FocusScope or a top-level item. Reviewed-by: Aaron Kennedy Reviewed-by: Yann Bodson
| * Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-123-0/+46
| | | | | | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
| * Resetting bindings through debugger interfaceLasse Holmstedt2010-07-094-0/+44
| | | | | | | | Reviewed-by: Aaron Kennedy
| * 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
| | | | | | | | | | | | Replace the usages of Follows with Behaviors, update docs.
| | * Added some documentation to spring animationmae2010-07-081-0/+9
| | |
| | * Fix spring animationmae2010-07-081-1/+3
| | | | | | | | | | | | | | | Do not stop a spring animation if the to value got changed while notifying the target property change.
| | * 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
| | | | | | | | | | | | | | | (should be handled by image providers, elements shouldn't have to know about the capabilities)
| | * Remove Image::pixmap property. QML applications should useBea Lam2010-07-083-14/+5
| | | | | | | | | | | | | | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980
| | * 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
| | | | | | | | QTBUG-11954
| * Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-085-46/+263
| | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
| * 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
| |/ | | | | | | QTBUG-11933
| * QML: Let the debugger now the name of embedded functions within a QML functionOlivier Goffart2010-07-071-1/+1
| | | | | | | | | | | | | | | | | | if you have stuff like Rectangle { function foo() {... } } We let QtScript, and hence the debugger know the function name. Reviewed-by: Roberto Raggi
| * Added QDeclarativeSpringAnimationmae2010-07-078-2/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed.
| * docsBea Lam2010-07-075-17/+23
| |
| * Don't crash if drag.target has no parentItemMartin Jones2010-07-071-2/+2
| | | | | | | | Task-number: QTBUG-11986
| * QDeclarativeText optimization.Michael Brasser2010-07-072-2/+5
| | | | | | | | | | | | updateSize() shouldn't trigger another updateSize(). Reviewed-by: Martin Jones
| * 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
| | |\ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the new currentIndex is in view, then there is no need to cancel a flick that is in progress. Task-number: QTBUG-11405
| | * | | 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
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983
| * | | Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-061-0/+1
| | |/ | |/| | | | | | | | | | Task-number: QTBUG-10297 Reviewed-by: Martin Jones
| * | Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-061-0/+9
| | | | | | | | | | | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones
| * | Export QDeclarativePixmapMartin Jones2010-07-061-1/+1
| | | | | | | | | | | | But its still a private class.
| * | docWarwick Allison2010-07-061-2/+2
| | |
| * | Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-051-3/+15
| | | | | | | | | | | | Task-number: QTBUG-11936
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0555-111/+140
| |\ \