summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1629-283/+1304
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-162-2/+2
| |\
| | * Fix warningsThomas Zander2010-09-162-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-162-72/+129
| |\ \
| | * | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-168-145/+294
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-1521-62/+118
| | |\
| | * | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | * | Doc: Continued work on the QML documentation.David Boddie2010-09-141-10/+49
| | * | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | * | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| * | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| * | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| * | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-6/+8
| * | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1516-53/+845
| |\ \ \ | | |_|/ | |/| |
| | * | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-151-0/+54
| | * | Export QDeclarativeScriptActionMarco Bubke2010-09-141-1/+1
| | * | Completing the interface for children/data/resourcesThomas Hartmann2010-09-144-3/+120
| | * | This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-1411-49/+670
* | | | 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