summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add QML support for methods returning QList<QObject *>Aaron Kennedy2010-03-094-35/+104
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0919-74/+158
|\
| * Update configure.exe to include declarative module by defaultJoona Petrell2010-03-091-0/+0
| |
| * Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-0918-74/+158
| | | | | | | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
* | CompileAaron Kennedy2010-03-091-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0915-74/+539
|\
| * Remove unused data member.Michael Brasser2010-03-092-2/+0
| |
| * Fix warning.Michael Brasser2010-03-091-0/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-096-22/+26
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-096-34/+22
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-098-48/+535
| | | |\
| | | * | Move pixmapChanged signal to QDeclarativeImageYann Bodson2010-03-094-8/+7
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6334
| | * | | When flicking with snap, bias towards moving at least one item.Martin Jones2010-03-092-14/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8839
| * | | | Fix warnings and change geometry-related functions to use reals.Michael Brasser2010-03-092-10/+10
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-09418-14807/+29138
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Minor cleanup.Michael Brasser2010-03-092-26/+15
| | |/ /
| | * | Add highlightRangeMode and snapMode to GridView.Martin Jones2010-03-094-20/+488
| | | | | | | | | | | | | | | | | | | | | | | | Brings ListView and GridView APIs closer. Task-number: QTBUG-8779
| * | | Doc fix.Michael Brasser2010-03-051-1/+5
| | | |
* | | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-0914-23/+230
| |/ / |/| | | | | | | | | | | | | | | | | QML now behaves in a way similar to QtScript when it comes to QObject ownership. QT-2803
* | | 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
| | | | | | | | | | | | | | | | ... even when -prefix is set
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-081-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest.
| | | * | Fix failing autotest.Alan Alpert2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | This was probably a bug in the test data.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-085-8/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix to mainwindow demo Fix build on Maemo X11 Fix crash on Win with 16bit screendepth when copy/pasting images Enable cleanup hooks when creating an EGL surface for a pixmap
| | | * | | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mask was not always correctly updated on the "blueTitleBar". Reviewed-by: gabi
| | | * | | Fix build on Maemo X11Tom Cooksey2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Tobias Hunger
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | | Fix crash on Win with 16bit screendepth when copy/pasting imagesaavit2010-03-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4687 Reviewed-by: Trond
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0810-467/+200
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove duration property from QSoundEffect. Fix effects.pri. Refactor QSoundEffect.
| | | * | | | | Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | * | | | | Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | * | | | | Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-08155-3074/+4257
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (43 commits) clearFocus() before setParentItem(0) on an item with focus. Remove expect fail from ListView currentIndex test fix QDeclarativeItem sceneEvent handling Make the animation property of Behavior deferred. Particles optimization and doc fixes. Add Flipable example. Fix Qt.tint() algorithm Disallow upper case property, signal and method names in QML Remove expected warning Use a better method for installing declarative demos. Fixed declarative examples not being installed. Remove code dupliation in fixupX/Y(), flickX/Y() Add PathView.isCurrentIndex and PathView.view attached properties Stop benchmark from crashing. Optimize Rectangle, Image, and Text creation. Make compile following QDeclarativeMetaProperty renaming Fixed declarative demos not being installed. Make test compile optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML ...
| | | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
* | | | | | | | | Minor anchors.fill optimization.Michael Brasser2010-03-094-2/+32
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-716
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-2424
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply copy the demo directories, instead of writing a stub .pro file.
| | * | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | QT-2976