summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-0326-180/+400
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0369-323/+1096
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-034-20/+57
| | |\
| | | * Save secondary scope inside the expression's scope objectAaron Kennedy2010-03-034-20/+57
| | * | More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-031-5/+5
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-037-40/+65
| | |\
| | | * QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject p...Aaron Kennedy2010-03-031-2/+9
| | | * Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-036-38/+56
| | * | '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-031-0/+5
| | |\
| | * | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| * | | 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
* | | | | 4.6.x compatWarwick Allison2010-03-031-0/+16
| |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-035-4/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
| * | | Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
* | | | 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.7Bea Lam2010-03-031-7/+13
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-031-1/+1
| |\ \ \
| * | | | 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-0389-1065/+1825
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| |/ / /
| * | | Fix build of importsTobias Hunger2010-03-0224-74/+153
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0253-230/+752
| |\ \ \ | | |/ / | |/| |
| | * | Compile fix on WindowsAlan Alpert2010-03-021-1/+1
| | * | Build fix on windowsTobias Hunger2010-03-021-1/+1
| | * | Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| | * | Moved qdeclarativemodules to importsmae2010-03-0218-31/+51
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0239-192/+682
| | |\ \
| | | * | Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | | * | Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | | * | Empty URL testAaron Kennedy2010-03-021-0/+7
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0236-190/+659
| | | |\ \
| | | | * \ Merge branch 'master' into 4.7Warwick Allison2010-03-0210-18/+97
| | | | |\ \
| | | | | * | docWarwick Allison2010-03-021-0/+1
| | | | | * | Move WebView to an extension plugin.Warwick Allison2010-03-028-18/+94
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0214-141/+325
| | | | | |\ \
| | | | | | * | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-012-4/+10
| | | | | |\ \ \
| | | | | * | | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | | | * | | | | Optimization.Michael Brasser2010-03-021-2/+2
| | | | * | | | | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0220-134/+436
| | | | |\ \ \ \ \
| * | | | | | | | | Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49