Packaging and deployment fixes.

Change-Id: If6e5ec67f1335356bbbb1695346221c7d692ab62
Reviewed-on: http://codereview.qt.nokia.com/3344
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

1 files changed, 29 insertions, 12 deletions

diff --git a/pkg.pri b/pkg.pri
index 4b3552816..f8eb64bd6 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -111,7 +111,11 @@ contains(TEMPLATE, app) {
 
 qt3d_deploy_qml {
     mt {
-        TARGET_DIR = /opt/mt/applications/$$TARGET
+        package {
+            TARGET_DIR = $$PWD
+        } else {
+            TARGET_DIR = /opt/mt/applications/$$TARGET
+        }
     } else {
         TARGET_DIR = $$QT3D_INSTALL_DATA/quick3d/resources/examples/$$TARGET
     }
@@ -221,18 +225,31 @@ defineTest(qtcAddDeployment) {
                 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
             }
         }
-#        installPrefix = /opt/$${TARGET}
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            item = item$${deploymentfolder}
-            itemfiles = $${item}.files
-            $$itemfiles = $$eval($${deploymentfolder}.source)
-            itempath = $${item}.path
-            $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
-            export($$itemfiles)
-            export($$itempath)
-            INSTALLS += $$item
+        mt {
+            for(deploymentfolder, DEPLOYMENTFOLDERS) {
+                item = item$${deploymentfolder}
+                itemfiles = $${item}.files
+                $$itemfiles = $$eval($${deploymentfolder}.source)
+                itempath = $${item}.path
+                $$itempath = /opt/mt/applications/$$TARGET
+                export($$itemfiles)
+                export($$itempath)
+                INSTALLS += $$item
+            }
+            target.path = /opt/mt/applications/$$TARGET
+        } else {
+            for(deploymentfolder, DEPLOYMENTFOLDERS) {
+                item = item$${deploymentfolder}
+                itemfiles = $${item}.files
+                $$itemfiles = $$eval($${deploymentfolder}.source)
+                itempath = $${item}.path
+                $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+                export($$itemfiles)
+                export($$itempath)
+                INSTALLS += $$item
+            }
+            target.path = $${installPrefix}/bin
         }
-        target.path = $${installPrefix}/bin
         export(icon.files)
         export(icon.path)
         export(desktopfile.files)