summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-05131-829/+1687
|\
| * Add a switch to the menu to hide/show the runtime warningsKai Koehne2010-05-055-17/+222
| * Fix i18n example.Yann Bodson2010-05-056-17/+81
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-05100-531/+999
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0535-120/+154
| | |\
| | | * Use enum rather than string for easing type.Yann Bodson2010-05-0535-120/+154
| | * | Fix cacheBuffer documentation.Martin Jones2010-05-053-12/+28
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-058-22/+22
| | |\
| | | * Docs - point to property types from tutorial and QML Basic Types pageBea Lam2010-05-052-10/+13
| | | * Fix qdoc errorsBea Lam2010-05-056-12/+9
| | * | Document delegate life cycle.Martin Jones2010-05-053-1/+11
| | * | little doc fix.Martin Jones2010-05-051-1/+1
| | |/
| | * Turn off smooth rendering for qDrawBorderPixmap() with transforms.Martin Jones2010-05-051-0/+14
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0521-207/+223
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-053-2/+13
| | | |\
| | | | * Don't start valuesource animations until all component objects have been comp...Michael Brasser2010-05-053-2/+13
| | | * | docWarwick Allison2010-05-0519-205/+210
| | | |/
| | * | Test for QList<QObject*> model with object properties changing.Martin Jones2010-05-051-0/+99
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0535-152/+396
| | |\ \ | | | |/
| | | * Example i18n.Warwick Allison2010-05-056-0/+69
| | | * Allow translations without extra command-line args, and document both.Warwick Allison2010-05-053-27/+68
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0558-467/+874
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-0522-119/+251
| | | | |\
| | | | | * Doc improvements, simplify example codeBea Lam2010-05-0519-118/+208
| | | | | * Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-053-1/+43
| | | | * | Null objects should appear as JS nullAaron Kennedy2010-05-053-4/+5
| | | | |/
| | | | * Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| | | * | syntax updateWarwick Allison2010-05-051-1/+1
| | * | | QList<QObject*> models now update their properties when they change.Martin Jones2010-05-058-15/+49
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0529-291/+514
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-044-52/+102
| | |\ \ \
| | * | | | Ensure flick endpoint is recalculated for variable height lists.Martin Jones2010-05-042-2/+3
| | | |_|/ | | |/| |
| * | | | Move Qt.widgets import to be an unsupported exampleAlan Alpert2010-05-0525-268/+386
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-049-168/+315
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Allow dynamic deletion of objects created with createQmlObjectAlan Alpert2010-05-041-1/+4
* | | | | Make component.createObject require a parent argumentAlan Alpert2010-05-0513-28/+39
| |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-04197-2236/+4507
|\ \ \ \ | |/ / /
| * | | Optimization for QDeclarativePaintedItem.Michael Brasser2010-05-042-12/+20
| * | | Update childrenRect when children are added or removed.Michael Brasser2010-05-044-3/+95
| * | | Optimize childrenRect.Michael Brasser2010-05-042-43/+87
| * | | Remove obsolete doc groupings.Michael Brasser2010-05-0415-69/+1
| | |/ | |/|
| * | Doc improvementsBea Lam2010-05-044-52/+102
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-04656-154657/+259318
| |\
| * | Remove QDeclarativeLoader::resizeModemae2010-05-0311-149/+68
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-30173-1928/+4138
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-304-5/+88
| | |\ \
| | | * | Ensure eval and Function are in the correct scopeAaron Kennedy2010-04-304-5/+88
| | * | | Don't create an anchors element so that we can check that there aren't anyMartin Jones2010-04-301-18/+30
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-3020-20/+121
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-309-14/+93
| | | |\ \