summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-157-14/+16
|\
| * Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-144-8/+8
| |\
| | * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-4/+4
| | * Fix compile warnings.Friedemann Kleint2010-09-143-4/+4
| * | In ParentChange treat flip in x and y as a 180 degree rotationMartin Jones2010-09-142-4/+6
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-136-10/+24
|\ \ | |/
| * When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-7/+16
| * Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-102-12/+14
|\ \ | |/
| * Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
| * Changing the Image 'source' should not go through the 'Loading' state if the ...Yann Bodson2010-09-101-10/+13
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0921-374/+593
|\ \ | |/
| * Update running animations if a SmoothedAnimation is changedAlan Alpert2010-09-092-1/+20
| * Fix SmoothedAnimation test and docsAlan Alpert2010-09-091-1/+7
| * Fix reversingModes of QDeclarativeSmoothedAnimationAlan Alpert2010-09-091-2/+3
| * Don't cause repaints during painting in Text elementMartin Jones2010-09-081-9/+7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-0818-350/+530
| |\
| | * Remove unused objectBea Lam2010-09-081-1/+0
| | * Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
| | * Merge branch '4.7' into qmldocsDavid Boddie2010-09-078-173/+239
| | |\
| | * | Doc: More work on the QML documentation.David Boddie2010-09-073-23/+37
| | * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-067-39/+59
| | |\ \
| | * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-10/+19
| | * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-036-16/+27
| | |\ \ \
| | * | | | Doc: qdoc fixes.David Boddie2010-09-021-1/+1
| | * | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| | * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0158-1694/+1893
| | |\ \ \ \
| | * | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-011-5/+6
| | * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2734-116/+255
| | |\ \ \ \ \
| | * | | | | | Doc: More work on the QML documentation.David Boddie2010-08-273-204/+263
| | * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2412-118/+111
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-233-3/+1
| | * | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-233-61/+150
| * | | | | | | | SpringAnimation velocity animation stop logic was fragile.Martin Jones2010-09-081-11/+26
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0713-212/+298
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-072-16/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix AnchorAnimation for multiple AnchorChanges with dependancies.Michael Brasser2010-09-062-16/+3
| * | | | | | | | ListView: Ensure highlight is positioned correctly in positionViewAtIndex().Martin Jones2010-09-071-15/+56
| |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-061-7/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Small cleanupAaron Kennedy2010-09-061-7/+5
| * | | | | | | | Fix PathView item position on insertion and removal.Martin Jones2010-09-063-128/+170
| |/ / / / / / /
| * | | | | | | Do not reset sourceSize when changing image source url.Yann Bodson2010-09-061-3/+0
| * | | | | | | Ensure all image state is updated before emitting changed signals.Martin Jones2010-09-061-5/+6
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-051-25/+23
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-034-8/+24
| | |\ \ \ \ \ \
| | * | | | | | | Cleanup visible item checking in positionersAlan Alpert2010-09-031-25/+23
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-037-20/+38
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | qreal == float fixesAaron Kennedy2010-09-031-1/+1
| | * | | | | | Don't modify the signal order on the second dynamic meta object passAaron Kennedy2010-09-031-4/+8