Added type property to StationScheduleModel

[quandoparte] / application / application.pro

diff --git a/application/application.pro b/application/application.pro
index 5d21e2e..0ab546e 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}\\"'
@@ -72,12 +75,20 @@ SOURCES += \
     $$PLATFORM_SOURCES \
     main.cpp \
     stationlistmodel.cpp \
-    stationlistproxymodel.cpp
+    stationlistproxymodel.cpp \
+    settings.cpp \
+    dataprovider.cpp \
+    stationschedulemodel.cpp \
+    stationscheduleitem.cpp
 
 HEADERS += \
     $$PLATFORM_HEADERS \
     stationlistmodel.h \
-    stationlistproxymodel.h
+    stationlistproxymodel.h \
+    settings.h \
+    dataprovider.h \
+    stationschedulemodel.h \
+    stationscheduleitem.h
 
 FORMS += \
     settingsdialog.ui \
@@ -107,25 +118,39 @@ OTHER_FILES += \
     resources/harmattan/qml/main.qml \
     resources/harmattan/qml/StationListPage.qml \
     resources/harmattan/qml/StationPage.qml \
-    resources/harmattan/qml/SearchBar.qml
+    resources/harmattan/qml/SearchBar.qml \
+    resources/harmattan/qml/PageHeader.qml \
+    resources/harmattan/qml/uiconstants.js \
+    resources/harmattan/qml/StationListPage.js \
+    resources/harmattan/qml/AboutPage.qml \
+    resources/harmattan/qml/InfoBar.qml \
+    resources/harmattan/qml/DroppedShadow.qml
 
 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
     DATADIR=$$PREFIX/share/apps/$${TARGET}
-    DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    DEFINES += DATADIR=\\\"$${DATADIR}\\\" PKGDATADIR=\\\"$${PKGDATADIR}\\\"
 }
 
 message(Installing to prefix $$PREFIX)
@@ -167,7 +192,8 @@ unix:!symbian {
 }
 
 harmattan {
-    qml.files = resources/harmattan/qml/*.qml
+    qml.files = resources/harmattan/qml/*.qml resources/harmattan/qml/*.js
     qml.path = $$DATADIR/qml
     INSTALLS += qml
 }
+