#elif defined(QT5)
#include <QGuiApplication>
#include <QQuickView>
+#include <QQmlError>
#endif
#include "settings.h"
#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 = MDeclarativeCache::qDeclarativeView();
#elif defined(QT5)
QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
+ app->setApplicationName("cameraplus");
+
QQuickView *view = MDeclarativeCache::qQuickView();
#endif
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");
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();