From efa596c43bbd5ac7dd3be668237ece49308037e4 Mon Sep 17 00:00:00 2001
From: Sarah Smith <sarah.j.smith@nokia.com>
Date: Tue, 2 Aug 2011 18:31:22 +1000
Subject: Fix windows packages.

After recent refactoring of build system windows packages were broken.
Now fixed.

Change-Id: I053560b45189334893dcd21db2b30009a6cb9a47
Reviewed-on: http://codereview.qt.nokia.com/2533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
---
 pkg.pri | 71 +++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 26 deletions(-)

(limited to 'pkg.pri')

diff --git a/pkg.pri b/pkg.pri
index e69eaafac..ec444624e 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -44,6 +44,8 @@ qt3dquick_deploy_pkg {
         QT += declarative opengl
 
         maemo: icons.files = icon-l-qtquick3d.png
+    } else {
+        CONFIG += qt3dquick
     }
 }
 
@@ -66,6 +68,10 @@ qt3d_deploy_pkg {
             INCLUDEPATH += ../../../include/Qt3D
         }
         QT += opengl
+
+        maemo: icons.files = icon-l-qt3d.png
+    } else {
+        CONFIG += qt3d
     }
 }
 
@@ -107,17 +113,17 @@ qt3d_deploy_qml {
     mt {
         TARGET_DIR = /opt/mt/applications/$$TARGET
     } else {
-        TARGET_DIR = $$QT3D_INSTALL_DATA/quick3d/examples/$$TARGET
+        TARGET_DIR = $$QT3D_INSTALL_DATA/quick3d/resources/examples/$$TARGET
     }
-
-    macx {
+    symbian {
+        TARGET_DIR = .
+    } else: macx {
         TARGET_DIR = .
     } else {
         !package {
             TARGET_DIR = ../../../bin/resources/examples/$$TARGET
         }
     }
-
     for(dir, INSTALL_DIRS) {
         di.source = $${dir}
         di.target = $$TARGET_DIR
@@ -138,31 +144,44 @@ defineTest(qtcAddDeployment) {
 
     win32 {
         copyCommand =
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-            source = $$replace(source, /, \\)
-            sourcePathSegments = $$split(source, \\)
-            target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
-            target = $$replace(target, /, \\)
-            !isEqual(source,$$target) {
-                !isEmpty(copyCommand):copyCommand += &&
-                isEqual(QMAKE_DIR_SEP, \\) {
-                    copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
-                } else {
-                    source = $$replace(source, \\\\, /)
-                    target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-                    target = $$replace(target, \\\\, /)
-                    copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+        !package {
+            for(deploymentfolder, DEPLOYMENTFOLDERS) {
+                source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+                source = $$replace(source, /, \\)
+                sourcePathSegments = $$split(source, \\)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
+                target = $$replace(target, /, \\)
+                !isEqual(source,$$target) {
+                    !isEmpty(copyCommand):copyCommand += &&
+                    isEqual(QMAKE_DIR_SEP, \\) {
+                        copyCommand += $$QMAKE_COPY_DIR \"$$source\" \"$$target\"
+                    } else {
+                        source = $$replace(source, \\\\, /)
+                        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                        target = $$replace(target, \\\\, /)
+                        copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+                    }
                 }
             }
+            !isEmpty(copyCommand) {
+                message(copyCommand - $$copyCommand)
+                copyCommand = @echo Copying application data... && $$copyCommand
+                copydeploymentfolders.commands = $$copyCommand
+                first.depends = $(first) copydeploymentfolders
+                export(first.depends)
+                export(copydeploymentfolders.commands)
+                QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+            }
         }
-        !isEmpty(copyCommand) {
-            copyCommand = @echo Copying application data... && $$copyCommand
-            copydeploymentfolders.commands = $$copyCommand
-            first.depends = $(first) copydeploymentfolders
-            export(first.depends)
-            export(copydeploymentfolders.commands)
-            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            item = item$${deploymentfolder}
+            itemfiles = $${item}.files
+            $$itemfiles = $$eval($${deploymentfolder}.source)
+            itempath = $${item}.path
+            $$itempath = $$eval($${deploymentfolder}.target)
+            export($$itemfiles)
+            export($$itempath)
+            INSTALLS += $$item
         }
     } else:unix {
         maemo5 {
-- 
cgit v1.2.1