From d84b1817ea4a9a1c80ff1a7cb9bb5dbc2a199c9a Mon Sep 17 00:00:00 2001
From: Patrick Burke <patrick.burke@nokia.com>
Date: Mon, 18 Jul 2011 16:44:46 +1000
Subject: Deployment updates.

Change-Id: Ia80e99c18b0a93e83a5478305b5ecb85c72b8190
Reviewed-on: http://codereview.qt.nokia.com/1732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
---
 pkg.pri     | 19 +++++++++++++++++--
 qml_pkg.pri | 12 +++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkg.pri b/pkg.pri
index 319b8707..a4f54897 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -35,9 +35,24 @@ contains(TEMPLATE, app) {
             # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
             icons.path = /usr/share/themes/base/meegotouch/icons
             INSTALLS += icons applnk
+
+            target.path += $$QT3D_INSTALL_BINS
+            INSTALLS += target
+        } else {
+            mt {
+                applnk.files = info.json
+                applnk.path = /opt/mt/applications/$${TARGET}
+
+                # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
+                icons.path = /opt/mt/applications/$${TARGET}
+                INSTALLS += icons applnk
+                target.path += /opt/mt/applications/$${TARGET}
+                INSTALLS += target
+            } else {
+                target.path += $$QT3D_INSTALL_BINS
+                INSTALLS += target
+            }
         }
-        target.path += $$QT3D_INSTALL_BINS
-        INSTALLS += target
     } else {
         DESTDIR = ../../../bin
     }
diff --git a/qml_pkg.pri b/qml_pkg.pri
index 0cf7e6e0..cd15d6a8 100644
--- a/qml_pkg.pri
+++ b/qml_pkg.pri
@@ -1,8 +1,14 @@
 # Manages deploying the QML files and resources along with the binary
 
-distInstalls.files = qml
-distInstalls.path = $$QT3D_INSTALL_DATA/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
+mt {
+    distInstalls.files = qml
+    distInstalls.path = /opt/mt/applications/$$TARGET
+    INSTALLS += distInstalls
+} else {
+    distInstalls.files = qml
+    distInstalls.path = $$QT3D_INSTALL_DATA/quick3d/examples/$$TARGET
+    INSTALLS += distInstalls
+}
 
 win32 {
     QMAKE_DEL_FILE = del /q
-- 
cgit v1.2.3