summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0925-507/+257
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0844-546/+341
| |\
| | * Always copy the qmldir files into the build directoryTobias Hunger2010-03-084-7/+7
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-081-1/+1
| | |\
| | | * Fix failing autotest.Alan Alpert2010-03-081-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-085-8/+11
| | |\ \
| | | * | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
| | | * | Fix build on Maemo X11Tom Cooksey2010-03-081-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-08541-12494/+26215
| | | |\ \
| | | | * | Enable cleanup hooks when creating an EGL surface for a pixmapTom Cooksey2010-03-082-6/+7
| | | * | | Fix crash on Win with 16bit screendepth when copy/pasting imagesaavit2010-03-081-0/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-0810-467/+200
| | |\ \ \ \
| | | * | | | Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| | | * | | | Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | * | | | Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-08155-3074/+4257
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | clearFocus() before setParentItem(0) on an item with focus.Martin Jones2010-03-082-3/+9
| | | * | | | Remove expect fail from ListView currentIndex testMartin Jones2010-03-081-3/+7
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-082-0/+2
| | | |\ \ \ \
| | | * | | | | fix QDeclarativeItem sceneEvent handlingYann Bodson2010-03-081-3/+3
| * | | | | | | Use one thread for all instances.Bea Lam2010-03-081-15/+19
* | | | | | | | Minor anchors.fill optimization.Michael Brasser2010-03-094-2/+32
| |_|_|/ / / / |/| | | | | |
* | | | | | | Make the animation property of Behavior deferred.Michael Brasser2010-03-082-0/+2
| |_|/ / / / |/| | | | |
* | | | | | Particles optimization and doc fixes.Michael Brasser2010-03-081-3/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0836-109/+171
|\ \ \ \ \ \
| * | | | | | Fix Qt.tint() algorithmAaron Kennedy2010-03-083-13/+9
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0823-96/+125
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Remove expected warningBea Lam2010-03-082-19/+2
| | * | | | | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
| | * | | | | Fixed declarative examples not being installed.Rohan McGovern2010-03-0814-1/+107
| * | | | | | Disallow upper case property, signal and method names in QMLAaron Kennedy2010-03-0810-0/+37
| |/ / / / /
* | | | | | Add Flipable example.Bea Lam2010-03-084-38/+50
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0822-567/+593
|\ \ \ \ \
| * | | | | Remove code dupliation in fixupX/Y(), flickX/Y()Martin Jones2010-03-087-467/+326
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0819-27/+128
| |\ \ \ \ \
| | * | | | | Stop benchmark from crashing.Michael Brasser2010-03-081-0/+2
| | * | | | | Optimize Rectangle, Image, and Text creation.Michael Brasser2010-03-089-24/+30
| * | | | | | Add PathView.isCurrentIndex and PathView.view attached propertiesMartin Jones2010-03-085-76/+235
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-088-0/+93
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
* | | | | | | Make compile following QDeclarativeMetaProperty renamingBea Lam2010-03-084-8/+8
|/ / / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-08324-13604/+27435
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0792-2420/+3396
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0592-2420/+3396
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0592-2420/+3396
| | | |\ \ \ \
| | | | * | | | optimize dynamic call-by-name awaymae2010-03-052-9/+15
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0590-2411/+3381
| | | | |\ \ \ \
| | | | | * | | | Add support for QtScript connect/disconnect syntax in QMLAaron Kennedy2010-03-0513-0/+427
| | | | | * | | | Minor perf improvement when running QML script blocksAaron Kennedy2010-03-051-2/+3
| | | | | * | | | Fix qdeclarative{audio,video} tests.Justin McPherson2010-03-054-14/+14