summaryrefslogtreecommitdiffstats
path: root/src/imports/imports.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-181-2/+0
| | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits) Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. ...
| * Fix naming.Warwick Allison2010-05-181-1/+1
| |
| * Move stuff from QML viewer to plugins.Warwick Allison2010-05-171-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * Fix autotestsAaron Kennedy2010-05-071-1/+1
| |
| * Move Qt.widgets import to be an unsupported exampleAlan Alpert2010-05-051-1/+1
| | | | | | | | | | | | | | | | Layout examples for QML are also cleaned up a bit. Layouts test removed, and LayoutItem test added, to clarify what we support. Reviewed-by: Michael Brasser
* | Removed mediaservices.Kurt Korbatits2010-05-181-1/+0
|/
* Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-1/+1
| | | | | | | Disabled decalarative multimedia module and the player demo if qt is build without mediaservices. Reviewed-by: Kurt Korbatits
* Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-111-1/+1
| | | | Task-number: QT-2846
* Fix build of importsTobias Hunger2010-03-021-0/+7
* Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree