* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined(QT4)
#include <QApplication>
#include <QDeclarativeView>
#include <QDeclarativeContext>
#include <QDeclarativeEngine>
#include <QtDeclarative>
#include <QGLWidget>
+#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"
+#include "soundvolumecontrol.h"
#include "displaystate.h"
#include "fsmonitor.h"
#include "cameraresources.h"
#include "compass.h"
#include "orientation.h"
-#include "geocode.h"
#include "mountprotector.h"
#include "trackerstore.h"
#include "focusrectangle.h"
#include "postcapturemodel.h"
#include "batteryinfo.h"
#include "gridlines.h"
-#include "deviceinfo.h"
#include "devicekeys.h"
#include "platformsettings.h"
#include "dbusservice.h"
+#include "phoneprofile.h"
+#include <MDeclarativeCache>
#ifdef QMLJSDEBUGGER
#include "qt_private/qdeclarativedebughelper_p.h"
#endif /* QMLJSDEBUGGER */
+#if defined(QT4)
#include <QAbstractFileEngineHandler>
#include "qmlfileengine.h"
return 0;
}
};
+#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(argc, argv);
+ QApplication *app = new QApplication(argc, argv);
+ app->setApplicationName("cameraplus");
QmlFileEngineHandler handler;
Q_UNUSED(handler);
-#ifdef QMLJSDEBUGGER
- QDeclarativeDebugHelper::enableDebugging();
-#endif /* QMLJSDEBUGGER */
+ QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
+#elif defined(QT5)
+ QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
+ app->setApplicationName("cameraplus");
+
+ QQuickView *view = MDeclarativeCache::qQuickView();
+#endif
- QDeclarativeView view;
- view.setAttribute(Qt::WA_NoSystemBackground);
- view.setViewport(new QGLWidget);
- view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
- view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
- view.viewport()->setAttribute(Qt::WA_NoSystemBackground);
+#if defined(QT4)
+ view->setAttribute(Qt::WA_NoSystemBackground);
+ view->setViewport(new QGLWidget);
+ view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+ view->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+ view->viewport()->setAttribute(Qt::WA_NoSystemBackground);
+#endif
+
+#if defined(QT5)
+ view->setResizeMode(QQuickView::SizeRootObjectToView);
+ // TODO:
+#endif
qmlRegisterType<Settings>("CameraPlus", 1, 0, "Settings");
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");
+ 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<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
+ 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");
qmlRegisterType<PostCaptureModel>("CameraPlus", 1, 0, "PostCaptureModel");
qmlRegisterType<BatteryInfo>("CameraPlus", 1, 0, "BatteryInfo");
qmlRegisterType<GridLines>("CameraPlus", 1, 0, "GridLines");
- qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
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"));
+
+#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();
- view.setSource(QUrl("qrc:/qml/main.qml"));
+ int ret = app->exec();
- view.showFullScreen();
+ delete view;
+ delete app;
- int ret = app.exec();
return ret;
}