Revert "Implemented per device resolution setting and selection"

[harmattan/cameraplus] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0fc23bd..407095b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,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);
@@ -89,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
 
@@ -137,7 +140,6 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   view->setSource(QUrl("qrc:/qml/main.qml"));
 
 #if defined(QT5)
-  view->showFullScreen();
   if (view->status() == QQuickView::Error) {
     qCritical() << "Errors loading QML:";
     QList<QQmlError> errors = view->errors();
@@ -151,9 +153,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
 
     return 1;
   }
-
 #endif
 
+  view->showFullScreen();
+
   int ret = app->exec();
 
   delete view;