From e0d9b3222830be386e950d1ec6adb1fa5f45bc42 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 8 Sep 2010 15:18:00 +0200
Subject: [PATCH] QML App Wizard: Simplify deployment rules.

Reviewed-by: Alessandro Portale
---
 .../qmlapplicationviewer.pri                  | 49 +++++++++----------
 .../wizards/qmlstandaloneapp.cpp              |  2 +-
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index a18c29d35e3..42391327e15 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -48,7 +48,27 @@ symbian {
         first.depends = $(first) copydeploymentfolders
         QMAKE_EXTRA_TARGETS += first copydeploymentfolders
     }
-} else:if(maemo5|maemo6) {
+} else:unix {
+    maemo5 {
+        desktopfile.path = /usr/share/applications/hildon       
+    } else {
+        desktopfile.path = /usr/share/applications
+        !isEqual(PWD,$$OUT_PWD) {
+            copyCommand = @echo Copying application data...
+            for(deploymentfolder, DEPLOYMENTFOLDERS) {
+                macx {
+                    target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+                } else {
+                    target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                }
+                copyCommand += && $(MKDIR) $$target
+                copyCommand += && $(COPY_DIR) $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) $$target
+            }
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
         item = item$${deploymentfolder}
         itemfiles = $${item}.files
@@ -58,33 +78,8 @@ symbian {
         INSTALLS += $$item
     }
     icon.files = $${TARGET}.png
-    icon.path = /usr/share/icons/hicolor/scalable/hildon
+    icon.path = /usr/share/icons/hicolor/64x64
     desktopfile.files = $${TARGET}.desktop
-    desktopfile.path = /usr/share/applications/hildon
     target.path = /opt/bin
     INSTALLS += desktopfile icon target
-} else:macx {
-    !isEqual(PWD,$$OUT_PWD) {
-        copyCommand = @echo Copying application data...
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
-            copyCommand += && $(MKDIR) $$target
-            copyCommand += && $(COPY_DIR) $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) $$target
-        }
-        copydeploymentfolders.commands = $$copyCommand
-        first.depends = $(first) copydeploymentfolders
-        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-    }
-} else { #linux
-    !isEqual(PWD,$$OUT_PWD) {
-        copyCommand = @echo Copying application data...
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-            copyCommand += && $(MKDIR) $$target
-            copyCommand += && $(COPY_DIR) $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) $$target
-        }
-        copydeploymentfolders.commands = $$copyCommand
-        first.depends = $(first) copydeploymentfolders
-        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-    }
 }
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index 7b43c14c208..56cf46a12e3 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -619,7 +619,7 @@ QByteArray QmlStandaloneApp::generateFile(GeneratedFileInfo::File file,
 
 int QmlStandaloneApp::stubVersion()
 {
-    return 1;
+    return 2;
 }
 
 static QList<GeneratedFileInfo> updateableFiles(const QString &mainProFile)