summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-30869-2007/+4497
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-30935-2250/+5724
| |\
| | * Make QDeclarativeListProperty a classAaron Kennedy2010-03-302-2/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-3010-77/+65
| | |\
| | | * Correctly parent repeater items.Michael Brasser2010-03-301-5/+5
| | | * Make sure cursor delegate is parented.Michael Brasser2010-03-292-0/+4
| | | * Allow just one dimension to be set, the other scaled accordinglyWarwick Allison2010-03-291-3/+11
| | | * Simplify import path.Warwick Allison2010-03-294-59/+45
| | | * Removed unneeded code.Roberto Raggi2010-03-292-10/+0
| | | * Update autotest a littleAlan Alpert2010-03-291-4/+2
| | * | Fix qdeclarativedom::loadDynamicProperty testAaron Kennedy2010-03-302-6/+10
| | |/
| | * Improve QML compiler statisticsAaron Kennedy2010-03-292-9/+45
| | * Use error enum not numbersWarwick Allison2010-03-291-2/+2
| | * Pass test.Warwick Allison2010-03-291-0/+14
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2916-65/+200
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-291-4/+0
| | | |\
| | | | * QDeclarativeItem::setParentItem should not modify the QObject parentAaron Kennedy2010-03-291-4/+0
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-297-50/+45
| | | |\ \ | | | | |/
| | | | * DocAaron Kennedy2010-03-291-45/+40
| | | | * Visual test fixes.Michael Brasser2010-03-295-4/+4
| | | | * DocAaron Kennedy2010-03-291-1/+1
| | | * | Ensure currentIndex is updated when PathView items are removed/movedMartin Jones2010-03-292-8/+37
| | | |/
| | | * Relayout items when Flow size changes.Martin Jones2010-03-294-0/+103
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2948-528/+1083
| | | |\
| | | * | Make sure the image reader thread is shutdown properlyMartin Jones2010-03-291-2/+14
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-299-29/+32
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-29690-318/+475
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2843-151/+399
| | | |\ \ \ \
| | | * | | | | Fix change description: Import -> importMartin Jones2010-03-281-1/+1
| | * | | | | | docWarwick Allison2010-03-291-4/+70
| | * | | | | | test error code tooWarwick Allison2010-03-291-3/+5
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Optimization: reduce allocationsAaron Kennedy2010-03-292-4/+4
| | * | | | | Doc.Michael Brasser2010-03-291-0/+5
| | * | | | | DocAaron Kennedy2010-03-291-2/+1
| | * | | | | Remove "variant" QML propertiesAaron Kennedy2010-03-293-4/+1
| | * | | | | Use QDateTime when specifying a "date" property in QMLAaron Kennedy2010-03-295-4/+43
| | * | | | | Update examples/declarative.proYann Bodson2010-03-292-2/+7
| | * | | | | Remove colorbrowser exampleYann Bodson2010-03-295-311/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-291-2/+5
| | |\ \ \ \ \
| | | * | | | | Fix for qdeclarativelanguage::listPropertiesAaron Kennedy2010-03-291-2/+5
| | * | | | | | docWarwick Allison2010-03-291-0/+4
| | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-293-6/+25
| | |\ \ \ \ \
| | | * | | | | Fix crash in QDeclarativePropertyMap.Michael Brasser2010-03-293-6/+25
| | * | | | | | Remove total wrongness.Warwick Allison2010-03-291-1/+0
| | * | | | | | Import path detail.Warwick Allison2010-03-291-1/+8
| | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2923-48/+865
| | |\ \ \ \ \
| | | * | | | | Add focus and key navigation example.Yann Bodson2010-03-298-0/+209
| | | * | | | | Add example on how to use Qt widgets in qml.Yann Bodson2010-03-294-0/+172
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2919-50/+77
| | | |\ \ \ \ \
| | | | * | | | | Add missing pro file.Michael Brasser2010-03-291-0/+7