Merge branch 'development'

[quandoparte] / application / application.pro

diff --git a/application/application.pro b/application/application.pro
index d1e8ceb..d10fcf4 100755 (executable)
--- a/application/application.pro
+++ b/application/application.pro
@@ -4,7 +4,9 @@
 #
 #-------------------------------------------------
 
-VERSION = 0.6.2
+isEmpty(VERSION) {
+    VERSION = 0.7.0rc
+}
 USE_RESOURCES = 0
 
 QT += network
@@ -65,6 +67,9 @@ maemo5 {
         keypressforwarder.h \
         settingsdialog.h \
         stationview.h
+    FORMS += \
+        settingsdialog.ui \
+        stationlistview.ui
 }
 !sailfish:!harmattan:!maemo5 {
     PLATFORM = desktop
@@ -115,10 +120,6 @@ HEADERS += \
     stationschedulemodel.h \
     stationscheduleitem.h
 
-FORMS += \
-    settingsdialog.ui \
-    stationlistview.ui
-
 QMLSOURCES = \
     resources/harmattan/qml/main.qml \
     resources/harmattan/qml/StationListPage.qml \
@@ -134,6 +135,7 @@ QMLSOURCES = \
     resources/harmattan/qml/DelayIndicator.qml \
     resources/harmattan/qml/StationScheduleDelegate.qml \
     resources/sailfish/qml/main.qml \
+    resources/sailfish/qml/cover/CoverPage.qml \
     resources/sailfish/qml/pages/AboutPage.qml \
     resources/sailfish/qml/pages/StationListPage.qml \
     resources/sailfish/qml/pages/StationPage.qml \
@@ -148,7 +150,7 @@ OTHER_FILES += \
     icons/64x64/quandoparte.png \
     icons/80x80/quandoparte.png \
     icons/scalable/quandoparte.svg \
-    icons/sailfish/90x90/quandoparte.png \
+    icons/sailfish/86x86/quandoparte.png \
     icons/sailfish/scalable/quandoparte.svg \
     icons/quandoparte.png \
     resources/quandoparte.css \
@@ -257,9 +259,9 @@ maemo5 {
 
 sailfish {
     QML_IMPORT_PATH = resources/sailfish/qml/
-    icon90.files = icons/sailfish/90x90/$${TARGET}.png
-    icon90.path = /usr/share/icons/hicolor/meegotouch/apps
-    INSTALLS += icon90
+    icon86.files = icons/sailfish/86x86/$${TARGET}.png
+    icon86.path = /usr/share/icons/hicolor/86x86/apps
+    INSTALLS += icon86
 }
 
 harmattan {