Merge pull request #523

8c17a8c fix build with scanner (MoroccanMalinois)

1 files changed, 4 insertions, 4 deletions

diff --git a/main.cpp b/main.cpp
index 486d4338..53ab4752 100644
--- a/main.cpp
+++ b/main.cpp
@@ -189,6 +189,10 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("defaultAccountName", accountName);
     engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
 
+    // Load main window (context properties needs to be defined obove this line)
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
+    QObject *rootObject = engine.rootObjects().first();
+
     bool builtWithScanner = false;
 #ifdef WITH_SCANNER
     builtWithScanner = true;
@@ -199,10 +203,6 @@ int main(int argc, char *argv[])
 #endif
     engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner);
 
-    // Load main window (context properties needs to be defined obove this line)
-    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
-    QObject *rootObject = engine.rootObjects().first();
-
     QObject::connect(eventFilter, SIGNAL(sequencePressed(QVariant,QVariant)), rootObject, SLOT(sequencePressed(QVariant,QVariant)));
     QObject::connect(eventFilter, SIGNAL(sequenceReleased(QVariant,QVariant)), rootObject, SLOT(sequenceReleased(QVariant,QVariant)));
     QObject::connect(eventFilter, SIGNAL(mousePressed(QVariant,QVariant,QVariant)), rootObject, SLOT(mousePressed(QVariant,QVariant,QVariant)));