Bumped revision to 0.4.1

[quandoparte] / application / application.pro

diff --git a/application/application.pro b/application/application.pro
index 7d846d2..547116b 100644 (file)
--- a/application/application.pro
+++ b/application/application.pro
@@ -5,11 +5,12 @@
 #-------------------------------------------------
 
 QT += webkit network maemo5
+CONFIG += qt webkit mobility
+MOBILITY = location
 
 TARGET = quandoparte
 TEMPLATE = app
-VERSION = 0.1.0
-
+VERSION = 0.4.1
 VERSION_STRING = '\\"$${VERSION}\\"'
 DEFINES += QP_VERSION=\"$${VERSION_STRING}\"
 
@@ -21,7 +22,8 @@ SOURCES += main.cpp \
     app.cpp \
     stationlistview.cpp \
     keypressforwarder.cpp \
-    stationlistmodel.cpp
+    stationlistmodel.cpp \
+    stationlistproxymodel.cpp
 
 HEADERS += \
     settingsdialog.h \
@@ -29,15 +31,13 @@ HEADERS += \
     app.h \
     stationlistview.h \
     keypressforwarder.h \
-    stationlistmodel.h
+    stationlistmodel.h \
+    stationlistproxymodel.h
 
 FORMS += \
     settingsdialog.ui \
     stationlistview.ui
 
-CONFIG += webkit mobility
-MOBILITY = location
-
 symbian {
     TARGET.UID3 = 0xe30fb688
     # TARGET.CAPABILITY += 
@@ -46,28 +46,33 @@ symbian {
 }
 
 OTHER_FILES += \
-    debian/changelog \
-    debian/compat \
-    debian/control \
-    debian/copyright \
-    debian/README \
-    debian/rules \
     quandoparte.desktop \
     icons/quandoparte.png \
     resources/quandoparte.css \
     resources/arrivals.css \
     resources/departures.css \
     $$replace(TRANSLATIONS, .ts, .qm) \
-    resources/stations/stations.qpl
+    resources/stations/stations.qpl \
+    resources/stations/generatelist.xq \
+    resources/stations/generateunclassifiedlist.xq
 
-message($${OTHER_FILES})
+unix {
+    isEmpty(PREFIX) {
+        maemo5 {
+            PREFIX=/opt/usr
+        } else {
+            PREFIX=/usr/local
+        }
+    }
+    BINDIR=$$PREFIX/bin
+    DATADIR=$$PREFIX/share/apps/$${TARGET}
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+}
+
+message(Installing to prefix $$PREFIX)
 
 unix:!symbian {
-    maemo5 {
-        target.path = /opt/usr/bin
-    } else {
-        target.path = /usr/local/bin
-    }
+    target.path = $$BINDIR
     INSTALLS += target
 }
 
@@ -76,7 +81,7 @@ unix:!symbian {
     maemo5 {
         desktopfile.path = /usr/share/applications/hildon
     } else {
-        desktopfile.path = /usr/share/applications
+        desktopfile.path = $$DATADIR/applications
     }
     INSTALLS += desktopfile
 }
@@ -85,19 +90,17 @@ unix:!symbian {
     css.files = resources/$${TARGET}.css resources/arrivals.css resources/departures.css
     i18n.files = $$replace(TRANSLATIONS, .ts, .qm)
     stations.files = resources/stations/stations.qpl
-    maemo5 {
-       i18n.path = /opt/usr/share/apps/$${TARGET}/i18n
-       css.path = /opt/usr/share/apps/$${TARGET}/css
-        stations.path = /opt/usr/share/apps/$${TARGET}/stations
-    } else {
-       i18n.path = /usr/share/apps/$${TARGET}/i18n
-       css.path = /usr/share/apps/$${TARGET}/css
-        stations.path = /usr/share/apps/$${TARGET}/stations
-    }
+
+    i18n.path = $$DATADIR/i18n
+    css.path = $$DATADIR/css
+    stations.path = $$DATADIR/stations
+
     icon48.files = icons/48x48/$${TARGET}.png
     icon64.files = icons/64x64/$${TARGET}.png
+
     icon48.path = /usr/share/icons/hicolor/48x48/apps
     icon64.path = /usr/share/icons/hicolor/64x64/apps
+
     INSTALLS += icon48
     INSTALLS += icon64
     INSTALLS += css
@@ -105,8 +108,12 @@ unix:!symbian {
     INSTALLS += stations
 }
 
-maemo5 {
+unix {
     desktopfile.files = $${TARGET}.desktop
-    desktopfile.path = /usr/share/applications/hildon
+    maemo5 {
+        desktopfile.path = /usr/share/applications/hildon
+    } else {
+        desktopfile.path = $$DATADIR/applications
+    }
     INSTALLS += desktopfile
 }