Sailfish port mostly done, bumped version to 6.0

[quandoparte] / application / main.cpp

diff --git a/application/main.cpp b/application/main.cpp
index 7e2c5b7..484529b 100644 (file)
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -19,32 +19,52 @@ Boston, MA 02110-1301, USA.
 
 */
 
+#ifdef TARGET_PLATFORM_FREMANTLE
 #include "app.h"
-#ifndef TARGET_PLATFORM_FREMANTLE
+#else
 #include "view.h"
 #endif
 
-#include <QApplication>
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
+#include <QtWidgets/QApplication>
+#else
+#include <QtGui/QApplication>
+#endif
 #include <QDir>
 #include <QDebug>
 #include <QLocale>
 #include <QTranslator>
 
+#ifdef TARGET_PLATFORM_HARMATTAN
+#include <MDeclarativeCache>
+#endif
+
 #ifndef QP_VERSION
 #define QP_VERSION "0.0.2"
 #endif
 
-int main(int argc, char *argv[])
+Q_DECL_EXPORT int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
-    a.setApplicationName("QuandoParte");
-    a.setOrganizationDomain("cirulla.net");
-    a.setApplicationVersion(QP_VERSION);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
+    QScopedPointer< QApplication > a(new QApplication(argc, argv));
+#elif TARGET_PLATFORM_HARMATTAN
+    QScopedPointer< QApplication > a(MDeclarativeCache::qApplication(argc, argv));
+#else
+    QScopedPointer< QApplication > a(new QApplication(argc, argv));
+#endif
+    a->setApplicationName("QuandoParte");
+    a->setOrganizationDomain("cirulla.net");
+    a->setApplicationVersion(QP_VERSION);
 
     QDir::setSearchPaths("css", QStringList(DATADIR "/css"));
     QDir::setSearchPaths("stations", QStringList(DATADIR "/stations"));
     QDir::setSearchPaths("i18n", QStringList(DATADIR "/i18n"));
+#ifdef USE_RESOURCES
+    QDir::setSearchPaths("qml", QStringList(DATADIR ""));
+#else
     QDir::setSearchPaths("qml", QStringList(DATADIR "/qml"));
+#endif
 
 #ifdef QT_KEYPAD_NAVIGATION
     QApplication::setNavigationMode(Qt::NavigationModeKeypadTabOrder);
@@ -54,7 +74,7 @@ int main(int argc, char *argv[])
     QTranslator translator;
     if (translator.load(QString("i18n:quandoparte_") + locale)) {
         qDebug() << "Translation for locale" << locale << "loaded";
-        a.installTranslator(&translator);
+        a->installTranslator(&translator);
     } else {
         qDebug() << "Translation for locale" << locale << "not found";
     }
@@ -65,5 +85,5 @@ int main(int argc, char *argv[])
     theView.show();
 #endif
 
-    return a.exec();
+    return a->exec();
 }