summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0368-243/+925
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0358-234/+906
| |\
| | * make example work againmae2010-03-032-5/+5
| | * Clairify a comment in one of the auto tests.Alan Alpert2010-03-031-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-03331-1258/+3552
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-035-22/+58
| | | |\
| | | | * Save secondary scope inside the expression's scope objectAaron Kennedy2010-03-035-22/+58
| | | * | More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-035-11/+11
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-0323-46/+166
| | | |\
| | | | * QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject p...Aaron Kennedy2010-03-035-2/+63
| | | | * Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-0318-44/+103
| | | * | 'on' syntax fixesYann Bodson2010-03-037-40/+40
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-036-35/+71
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0320-41/+388
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-036-0/+316
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0316-10/+329
| | | | | | |\
| | | | | | * | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-032-1/+1
| | | | | |\ \ \
| | | | | * | | | OS-friendlier, less noisy.Warwick Allison2010-03-031-29/+52
| | | | | * | | | fix crash, re-enable settings testWarwick Allison2010-03-031-4/+2
| | | | * | | | | Auto test for QTBUG-8677Martin Jones2010-03-033-2/+12
| | | * | | | | | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch 'master' into 4.7Yann Bodson2010-03-035-0/+311
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | add colorbrowser qml exampleYann Bodson2010-03-035-0/+311
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-039-74/+230
| | |\ \ \ \ \ \
| | | * | | | | | Fixed compile of some tests with `-qtnamespace'Rohan McGovern2010-03-032-0/+11
| | | * | | | | | Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| | | * | | | | | Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| | | * | | | | | Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-033-7/+11
| | | |\ \ \ \ \ \ | | |/ / / / / / /
| | | * | | | | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
| * | | | | | | | Fix url in source() test.Bea Lam2010-03-031-1/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-032-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Disable until plugin objects problem resolved.Warwick Allison2010-03-031-0/+3
| * | | | | | silence debuggeryWarwick Allison2010-03-031-0/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-031-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Add import Qt.widgets 4.6 to layout.qml exampleJoona Petrell2010-03-031-1/+1
| * | | | | | Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
| * | | | | | make runnable from elsewhereWarwick Allison2010-03-031-3/+3
| * | | | | | remove debuggerWarwick Allison2010-03-031-1/+0
| * | | | | | runnable from elsewhereWarwick Allison2010-03-031-1/+1
| |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-037-8/+322
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Ensure error is received - the root object is INITIALLY zero.Warwick Allison2010-03-031-0/+2
* | | | | | Fix test to listen for signal instead of try-waiting for property.Bea Lam2010-03-032-7/+11
| |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-7/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-033-4/+5
| |\ \ \ \ \ | | |/ / / /
| * | | | | Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-03217-1531/+3399
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-032-4/+4
| |\ \ \ \ \
| | * | | | | Initialize variable before use.Michael Brasser2010-03-021-1/+1
generated by cgit v0.12 at 2024-11-15 13:19:02 (GMT)