Revert "Implemented per device resolution setting and selection"

[harmattan/cameraplus] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 8dfdd0f..407095b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 #elif defined(QT5)
 #include <QGuiApplication>
 #include <QQuickView>
+#include <QQmlError>
 #endif
 
 #include "settings.h"
@@ -35,15 +36,14 @@
 #ifdef HARMATTAN
 #include "quillitem.h"
 #endif
+#include "geocode.h"
+#include "deviceinfo.h"
 #include "soundvolumecontrol.h"
 #include "displaystate.h"
 #include "fsmonitor.h"
 #include "cameraresources.h"
 #include "compass.h"
 #include "orientation.h"
-#if defined(QT4) // TODO:
-#include "geocode.h"
-#endif
 #include "mountprotector.h"
 #include "trackerstore.h"
 #include "focusrectangle.h"
@@ -53,14 +53,10 @@
 #include "postcapturemodel.h"
 #include "batteryinfo.h"
 #include "gridlines.h"
-#include "deviceinfo.h"
 #include "devicekeys.h"
 #include "platformsettings.h"
 #include "dbusservice.h"
-
-#ifdef HAVE_BOOSTER
 #include <MDeclarativeCache>
-#endif
 
 #ifdef QMLJSDEBUGGER
 #include "qt_private/qdeclarativedebughelper_p.h"
@@ -86,18 +82,17 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
 #if defined(QT4)
   QApplication::setAttribute(Qt::AA_X11InitThreads, true);
   QApplication *app = new QApplication(argc, argv);
+  app->setApplicationName("cameraplus");
 
   QmlFileEngineHandler handler;
   Q_UNUSED(handler);
 
-  QDeclarativeView *view = new QDeclarativeView;
-#elif defined(HAVE_BOOSTER)
+  QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
+#elif defined(QT5)
   QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
+  app->setApplicationName("cameraplus");
+
   QQuickView *view = MDeclarativeCache::qQuickView();
-#elif defined(QT5)
-  QGuiApplication::setAttribute(Qt::AA_X11InitThreads, true);
-  QGuiApplication *app = new QGuiApplication(argc, argv);
-  QQuickView *view = new QQuickView;
 #endif
 
 #ifdef QMLJSDEBUGGER
@@ -122,15 +117,14 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
 #ifdef HARMATTAN
   qmlRegisterType<QuillItem>("CameraPlus", 1, 0, "QuillItem");
 #endif
+  qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
+  qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
   qmlRegisterType<SoundVolumeControl>("CameraPlus", 1, 0, "SoundVolumeControl");
   qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
   qmlRegisterType<FSMonitor>("CameraPlus", 1, 0, "FSMonitor");
   qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");
-  qmlRegisterType<Compass>("CameraPlus", 1, 0, "Compass");
-  qmlRegisterType<Orientation>("CameraPlus", 1, 0, "Orientation");
-#if defined(QT4) // TODO:
-  qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
-#endif
+  qmlRegisterType<Compass>("CameraPlus", 1, 0, "CameraCompass");
+  qmlRegisterType<Orientation>("CameraPlus", 1, 0, "CameraOrientation");
   qmlRegisterType<MountProtector>("CameraPlus", 1, 0, "MountProtector");
   qmlRegisterType<TrackerStore>("CameraPlus", 1, 0, "TrackerStore");
   qmlRegisterType<FocusRectangle>("CameraPlus", 1, 0, "FocusRectangle");
@@ -140,14 +134,27 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<PostCaptureModel>("CameraPlus", 1, 0, "PostCaptureModel");
   qmlRegisterType<BatteryInfo>("CameraPlus", 1, 0, "BatteryInfo");
   qmlRegisterType<GridLines>("CameraPlus", 1, 0, "GridLines");
-#if defined(QT4) // TODO:
-  qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
-#endif
   qmlRegisterType<DeviceKeys>("CameraPlus", 1, 0, "DeviceKeys");
   qmlRegisterType<PlatformSettings>("CameraPlus", 1, 0, "PlatformSettings");
 
   view->setSource(QUrl("qrc:/qml/main.qml"));
 
+#if defined(QT5)
+  if (view->status() == QQuickView::Error) {
+    qCritical() << "Errors loading QML:";
+    QList<QQmlError> errors = view->errors();
+
+    foreach (const QQmlError& error, errors) {
+      qCritical() << error.toString();
+    }
+
+    delete view;
+    delete app;
+
+    return 1;
+  }
+#endif
+
   view->showFullScreen();
 
   int ret = app->exec();