Fix missing desktop file during installation

Also install in /opt/quandoparte and get rid of warnings i cannot handle
anyway

diff --git a/application/application.pro b/application/application.pro
index ad795a3..1e96328 100644 (file)
--- a/application/application.pro
+++ b/application/application.pro
@@ -7,6 +7,12 @@
 VERSION = 0.4.80
 
 QT += webkit network
+CONFIG += qt webkit mobility
+MOBILITY = location
+
+contains(MEEGO_EDITION,harmattan) {
+    CONFIG += harmattan
+}
 
 harmattan {
     QT += declarative
@@ -14,7 +20,7 @@ harmattan {
     DEFINES += TARGET_PLATFORM_HARMATTAN
     # enable booster
     CONFIG += qdeclarative-boostable
-    QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
+    QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -Wno-psabi
     QMAKE_LFLAGS += -pie -rdynamic
     PLATFORM_SOURCES = view.cpp
     PLATFORM_HEADERS = view.h
@@ -54,9 +60,6 @@ message(Platform Sources: $$PLATFORM_SOURCES)
 message(Qt Modules Used:  $$QT)
 message(Building version: $$VERSION)
 
-CONFIG += qt webkit mobility
-MOBILITY = location
-
 TARGET = quandoparte
 TEMPLATE = app
 VERSION_STRING = '\\"$${VERSION}\\"'
@@ -126,20 +129,28 @@ unix {
     isEmpty(PREFIX) {
         maemo5 {
             PREFIX=/opt/usr
-        } else {
+        }
+        harmattan {
+            PREFIX=/opt/$${TARGET}
+        }
+        desktop {
             PREFIX=/usr/local
         }
     }
     maemo5 {
         DESKTOPDIR=/usr/share/applications/hildon
-    } else {
+    }
+    harmattan {
+        DESKTOPDIR=/usr/share/applications
+    }
+    desktop {
         DESKTOPDIR=$$PREFIX/share/applications
     }
 
     BINDIR=$$PREFIX/bin
     DESKTOPDIR=$$PREFIX/share/applications
     DATADIR=$$PREFIX/share/apps/$${TARGET}
-    DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    DEFINES += DATADIR=\\\"$${DATADIR}\\\" PKGDATADIR=\\\"$${PKGDATADIR}\\\"
 }
 
 message(Installing to prefix $$PREFIX)
@@ -185,5 +196,3 @@ harmattan {
     qml.path = $$DATADIR/qml
     INSTALLS += qml
 }
-
-

diff --git a/application/resources/harmattan/applications/quandoparte.desktop b/application/resources/harmattan/applications/quandoparte.desktop
index ec167a4..5fe74ce 100644 (file)
--- a/application/resources/harmattan/applications/quandoparte.desktop
+++ b/application/resources/harmattan/applications/quandoparte.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=Quando Parte
-Exec=/usr/bin/quandoparte
+Exec=/opt/quandoparte/bin/quandoparte
 Icon=/usr/share/icons/hicolor/scalable/apps/quandoparte.svg
 X-Window-Icon=
 X-HildonDesk-ShowInToolbar=true