summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary additional hash of QDeclarativeGridViewAttachedMartin Jones2010-03-042-21/+7
* Fix spelling.Martin Jones2010-03-042-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-041-1/+1
|\
| * Fix test.Michael Brasser2010-03-041-1/+1
* | Document that the views do not set clip: true.Martin Jones2010-03-042-0/+10
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0413-37/+47
|\ \ | |/
| * Fix benchmarks.Michael Brasser2010-03-0413-37/+47
* | Set StrongFocus on QDeclarativeView so that elements can get focus.Martin Jones2010-03-041-0/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-036-5/+26
|\
| * Fix Samegame.Michael Brasser2010-03-031-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-033-13/+31
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-6/+19
| | |\
| | * | Increase test timerBea Lam2010-03-031-1/+2
| * | | Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-032-3/+3
| * | | system import path not supported with Qt 4.6.Warwick Allison2010-03-031-0/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-0353-204/+539
| |\ \ \
| * | | | 4.6.x compatWarwick Allison2010-03-031-0/+16
* | | | | Make sure currentIndex is updated when view is flicked.Martin Jones2010-03-031-0/+1
| |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-032-7/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0368-243/+925
| |\ \ \ | | | |/ | | |/|
| * | | 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.7Martin Jones2010-03-0352-202/+527
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | | |\ \ \
| | | * | | | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| | * | | | | 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 painting Rectangle with radius < side/2.Martin Jones2010-03-031-6/+19
| |_|_|_|/ / / |/| | | | | |
* | | | | | | 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
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge branch 'master' into 4.7Yann Bodson2010-03-035-0/+311
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | add colorbrowser qml exampleYann Bodson2010-03-035-0/+311
| | * | | | | | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5