Revert "Implemented per device resolution setting and selection"

[harmattan/cameraplus] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0e09e34..407095b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,15 +28,16 @@
 #elif defined(QT5)
 #include <QGuiApplication>
 #include <QQuickView>
+#include <QQmlError>
 #endif
 
 #include "settings.h"
 #include "filenaming.h"
 #ifdef HARMATTAN
 #include "quillitem.h"
+#endif
 #include "geocode.h"
 #include "deviceinfo.h"
-#endif
 #include "soundvolumecontrol.h"
 #include "displaystate.h"
 #include "fsmonitor.h"
@@ -81,6 +82,7 @@ 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);
@@ -88,6 +90,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
 #elif defined(QT5)
   QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
+  app->setApplicationName("cameraplus");
+
   QQuickView *view = MDeclarativeCache::qQuickView();
 #endif
 
@@ -112,15 +116,15 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<FileNaming>("CameraPlus", 1, 0, "FileNaming");
 #ifdef HARMATTAN
   qmlRegisterType<QuillItem>("CameraPlus", 1, 0, "QuillItem");
+#endif
   qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
   qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
-#endif
   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");
+  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");
@@ -135,6 +139,22 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
 
   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();