Implemented capturing via proximity sensor

[harmattan/cameraplus] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index abfad89..7921138 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,6 +56,7 @@
 #include "devicekeys.h"
 #include "platformsettings.h"
 #include "dbusservice.h"
+#include "phoneprofile.h"
 #include <MDeclarativeCache>
 
 #ifdef QMLJSDEBUGGER
@@ -79,9 +80,14 @@ class QmlFileEngineHandler : public QAbstractFileEngineHandler {
 #endif
 
 Q_DECL_EXPORT int main(int argc, char *argv[]) {
+#ifdef QMLJSDEBUGGER
+  QDeclarativeDebugHelper::enableDebugging();
+#endif /* QMLJSDEBUGGER */
+
 #if defined(QT4)
   QApplication::setAttribute(Qt::AA_X11InitThreads, true);
   QApplication *app = new QApplication(argc, argv);
+  app->setApplicationName("cameraplus");
 
   QmlFileEngineHandler handler;
   Q_UNUSED(handler);
@@ -89,13 +95,11 @@ 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
 
-#ifdef QMLJSDEBUGGER
-  QDeclarativeDebugHelper::enableDebugging();
-#endif /* QMLJSDEBUGGER */
-
 #if defined(QT4)
   view->setAttribute(Qt::WA_NoSystemBackground);
   view->setViewport(new QGLWidget);
@@ -133,6 +137,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<GridLines>("CameraPlus", 1, 0, "GridLines");
   qmlRegisterType<DeviceKeys>("CameraPlus", 1, 0, "DeviceKeys");
   qmlRegisterType<PlatformSettings>("CameraPlus", 1, 0, "PlatformSettings");
+  qmlRegisterType<PhoneProfile>("CameraPlus", 1, 0, "PhoneProfile");
 
   view->setSource(QUrl("qrc:/qml/main.qml"));