Merge PR #971: Rework overlay mechanism

nymea-app.pro

@@ -115,7 +115,7 @@ INSTALLS += ubuntu_files
 # Translations support
 TRANSLATIONS += $$files($$absolute_path(nymea-app)/translations/*.ts, true)
 !equals(OVERLAY_PATH, "") {
-    TRANSLATIONS += $$files($${OVERLAY_PATH}/translations/*ts, true)
+    include($${OVERLAY_PATH}/translations.pri)
 }
 system("lrelease $$TRANSLATIONS")
 lrelease.commands = lrelease $$TRANSLATIONS

nymea-app/main.cpp

@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<ConfiguredHostsProxyModel>("Nymea", 1, 0, "ConfiguredHostsProxyModel");
     qmlRegisterUncreatableType<ConfiguredHost>("Nymea", 1, 0, "ConfiguredHost", "Get them from ConfiguredHostsModel");
 
-#ifdef OVERLAY_PATH
+#ifdef OVERLAY_QMLTYPES
     registerOverlayTypes("Nymea", 1, 0);
 #endif
 

nymea-app/nymea-app.pro

@@ -68,15 +68,9 @@ linux:!android:!ubports: {
 
 
 !equals(OVERLAY_PATH, "") {
-    message("Resource overlay enabled. Will be using overlay from $${OVERLAY_PATH}")
-    RESOURCES += $${OVERLAY_PATH}/overlay.qrc
-
-    exists($${OVERLAY_PATH}/src/src.pri) {
-        message("Including sources from overlay")
-        include($${OVERLAY_PATH}/src/src.pri)
+    message("Overlay enabled. Will be using overlay from $${OVERLAY_PATH}")
+    include($${OVERLAY_PATH}/overlay.pri)
     DEFINES += OVERLAY_PATH=\\\"$${OVERLAY_PATH}\\\"
-        DEFINES += OVERLAY_QMLTYPES=\\\"$${OVERLAY_PATH}/src/qmltypes.h\\\"
-    }
 } else {
     RESOURCES += styles.qrc
 }