summaryrefslogtreecommitdiffstats
path: root/imports
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-02 17:19:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-02 17:19:32 (GMT)
commitba7677f77c35f7e6be9d8330d4e539d816cc33fd (patch)
tree5e6d0eeba0617b5d17781e66edb312574c66a3b9 /imports
parent7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd (diff)
parent4eaa7599be17d0838f98e2bafb0f0c8a0787530e (diff)
downloadQt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.zip
Qt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.tar.gz
Qt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Add minehunt README Refactor demos Rewrite Minehunt demo to use the runtime. Adapted example to use the import mechanism Compile fix on Windows Build fix on windows Fix qml import modules loading on Windows Let the 'qml' runtime use its applicationDirPath as importsPath Moved qdeclarativemodules to imports Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. ...
Diffstat (limited to 'imports')
-rw-r--r--imports/org/webkit/qmldir1
1 files changed, 1 insertions, 0 deletions
diff --git a/imports/org/webkit/qmldir b/imports/org/webkit/qmldir
new file mode 100644
index 0000000..258aa2c
--- /dev/null
+++ b/imports/org/webkit/qmldir
@@ -0,0 +1 @@
+plugin webkitqmlplugin