From 1dc40aa28ee93ee067c18349dc54e7b8b4f4dc4f Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 25 Mar 2010 15:55:30 +1000
Subject: Add Symbian deploy section for qml import plugins

Task-number: QTBUG-9364
Reviewed-by: jbarron
---
 demos/declarative/minehunt/minehunt.pro        | 15 +++++++++++++++
 mkspecs/features/symbian/data_caging_paths.prf |  1 +
 src/imports/multimedia/multimedia.pro          | 11 +++++++++++
 src/imports/particles/particles.pro            | 11 +++++++++++
 src/imports/webkit/webkit.pro                  | 11 +++++++++++
 src/imports/widgets/widgets.pro                | 11 +++++++++++
 6 files changed, 60 insertions(+)

diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 2df33e6..03059c7 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -23,3 +23,18 @@ MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCo
 
 INSTALLS = sources MinehuntCore_sources target
 
+symbian:{
+    load(data_caging_paths)
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = minehunt.dll \
+    MinehuntCore/Explosion.qml \
+    MinehuntCore/pics \
+    MinehuntCore/qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/MinehuntCore 
+    DEPLOYMENT = importFiles
+}
+ 
+INSTALLS = sources MinehuntCore_sources target
diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf
index 6f40bb5..ae9bc09 100644
--- a/mkspecs/features/symbian/data_caging_paths.prf
+++ b/mkspecs/features/symbian/data_caging_paths.prf
@@ -75,6 +75,7 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) {
 }
 
 isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
+isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/imports
 isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
 isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps
 isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 16b3ace..8792e2b 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -23,4 +23,15 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+symbian:{
+    load(data_caging_paths)
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = multimedia.dll \
+    qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
+    
+    DEPLOYMENT = importFiles
+}
+
 INSTALLS += target qmldir
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 02d9ea6..53d9c24 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -17,4 +17,15 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+symbian:{
+    load(data_caging_paths)
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = particles.dll \
+    qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
+    
+    DEPLOYMENT = importFiles
+}
+
 INSTALLS += target qmldir
diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro
index ef08efe..a11f87f 100644
--- a/src/imports/webkit/webkit.pro
+++ b/src/imports/webkit/webkit.pro
@@ -14,4 +14,15 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+symbian:{
+    load(data_caging_paths)
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = webkitqmlplugin.dll \
+    qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
+    
+    DEPLOYMENT = importFiles
+}
+
 INSTALLS += target qmldir
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
index aa09b3c..bf2576d 100644
--- a/src/imports/widgets/widgets.pro
+++ b/src/imports/widgets/widgets.pro
@@ -18,4 +18,15 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+symbian:{
+    load(data_caging_paths)
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = widgets.dll \
+    qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
+    
+    DEPLOYMENT = importFiles
+}
+
 INSTALLS += target qmldir
-- 
cgit v0.12