summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-04-06 06:52:51 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-04-06 06:52:51 (GMT)
commit3a632cb5f1c1da5c2e72ce167e35a42778867829 (patch)
tree76540ae0ef94b3069afb2f043bd0d26d0b26cc5b /src/imports
parentab9c4f04fe86cbeed28800cbe0473738d9959871 (diff)
parentcb85dd1db4e42b35fd3727874d718389238b801f (diff)
downloadQt-3a632cb5f1c1da5c2e72ce167e35a42778867829.zip
Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.gz
Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/multimedia.pro2
-rw-r--r--src/imports/particles/particles.pro2
-rw-r--r--src/imports/webkit/webkit.pro2
-rw-r--r--src/imports/widgets/widgets.pro2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 78618fc..92f7ec4 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -27,7 +27,7 @@ symbian:{
load(data_caging_paths)
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = multimedia.dll \
+ importFiles.sources = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/multimedia.dll \
qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index a46db8c..58bfe05 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -21,7 +21,7 @@ symbian:{
load(data_caging_paths)
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = particles.dll \
+ importFiles.sources = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/particles.dll \
qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro
index 7463a7f..62db9ac 100644
--- a/src/imports/webkit/webkit.pro
+++ b/src/imports/webkit/webkit.pro
@@ -18,7 +18,7 @@ symbian:{
load(data_caging_paths)
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = webkitqmlplugin.dll \
+ importFiles.sources = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/webkitqmlplugin.dll \
qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index cccd8b4..408f878 100644
--- a/src/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -22,7 +22,7 @@ symbian:{
load(data_caging_paths)
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
- importFiles.sources = widgets.dll \
+ importFiles.sources = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/widgets.dll \
qmldir
importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH