Allow to set custom qml path for app

Author: neochapay

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.0)
 
 project(glacierapp
-    VERSION 1.0.0
+    VERSION 1.1
     DESCRIPTION "Glacier applications wrapper library")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 

src/glacierapp.cpp

@@ -107,16 +107,20 @@ QQmlApplicationEngine* GlacierApp::engine(QObject* parent)
     return s_engine;
 }
 
-QQuickWindow* GlacierApp::showWindow()
+QQuickWindow* GlacierApp::showWindow(QString rootQMLPath)
 {
     QQmlApplicationEngine* engine = GlacierApp::engine(qApp);
-    QString rcMain(":/" + QCoreApplication::applicationName() + ".qml");
-    QFile rcFile(rcMain);
+    if(rootQMLPath.isEmpty()) {
+        QString rcMain(":/" + QCoreApplication::applicationName() + ".qml");
+        QFile rcFile(rcMain);
 
-    if (rcFile.exists()) {
-        engine->load("qrc" + rcMain);
+        if (rcFile.exists()) {
+            engine->load("qrc" + rcMain);
+        } else {
+            engine->load(QUrl::fromLocalFile(appDirectory() + QStringLiteral("%1.qml").arg(QCoreApplication::applicationName())));
+        }
     } else {
-        engine->load(QUrl::fromLocalFile(appDirectory() + QStringLiteral("%1.qml").arg(QCoreApplication::applicationName())));
+        engine->load(QUrl::fromLocalFile(rootQMLPath));
     }
 
     if (engine->rootObjects().isEmpty()) {
@@ -157,6 +161,11 @@ QQuickWindow* GlacierApp::showWindow()
     return window;
 }
 
+QQuickWindow *GlacierApp::showWindow()
+{
+    return showWindow(QString());
+}
+
 void GlacierApp::setLanguage(QLocale::Language lang)
 {
 #ifdef HAS_MLITE

src/glacierapp.h

@@ -34,6 +34,7 @@ class GlacierApp : public QObject {
 public:
     static QGuiApplication* app(int& argc, char** argv);
     static QQmlApplicationEngine* engine(QObject* parent = nullptr);
+    static QQuickWindow* showWindow(QString rootQMLPath);
     static QQuickWindow* showWindow();
     static void setLanguage(QLocale::Language lang);
     static void wipe();