X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=blobdiff_plain;f=deployment.pri;fp=deployment.pri;h=d515c67e0e5d084d1fc4f42e4b464e8a2291d66e;hp=266eed37827c440d8914955290825e3ee6f2f525;hb=b58ae22b7840fd1c5675fcc01971c9181c2e9b29;hpb=b63a62fbf2b7b3b13dda5898a7ff075ecbda6693

diff --git a/deployment.pri b/deployment.pri
index 266eed3..d515c67 100644
--- a/deployment.pri
+++ b/deployment.pri
@@ -51,9 +51,16 @@ symbian {
     }
 } else:unix {
     maemo5 {
+        desktopfile.files = $${TARGET}_fremantle.desktop
         desktopfile.path = /usr/share/applications/hildon
-    } else {
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
         desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
         copyCommand =
         for(deploymentfolder, DEPLOYMENTFOLDERS) {
             source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
@@ -92,16 +99,18 @@ symbian {
         export($$itempath)
         INSTALLS += $$item
     }
-    icon.files = $${TARGET}.png
-    icon.path = /usr/share/icons/hicolor/64x64/apps
-    desktopfile.files = $${TARGET}.desktop
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+
     target.path = $${installPrefix}/bin
-    export(icon.files)
-    export(icon.path)
-    export(desktopfile.files)
-    export(desktopfile.path)
     export(target.path)
-    INSTALLS += desktopfile icon target
+    INSTALLS += target
 }
 
 export (ICON)