Merge "qml: QML wouldn't load if there isn't DBUS support builtin"

[apps/mediaplayer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index dd84f59..8ad7b7f 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -90,6 +90,11 @@ int main(int argc, char *argv[])
 #if defined(HAVE_DBUS)
     DbusService dbus_service;
     context->setContextProperty("dbus", &dbus_service);
+#endif
+
+    engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+
+#if defined(HAVE_DBUS)
 #if defined(HAVE_LIGHTMEDIASCANNER)
     if (!dbus_service.enableLMS())
        qWarning() << "Cannot run enableLMS";
@@ -97,7 +102,6 @@ int main(int argc, char *argv[])
     if (!dbus_service.enableBluetooth())
        qWarning() << "Cannot run enableBluetooth";
 #endif
-    engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
     return app.exec();
 }