Update overlay loading mechanism

nymea-app.pro

@@ -8,10 +8,10 @@ SUBDIRS = libnymea-app experiences nymea-app
 experiences.depends = libnymea-app
 nymea-app.depends = libnymea-app experiences
 
-withtests: {
-    SUBDIRS += tests
-    tests.depends = libnymea-app
-}
+# withtests: {
+#     SUBDIRS += tests
+#     tests.depends = libnymea-app
+# }
 
 # Building a Windows installer:
 # Make sure your environment has the toolchain you want (e.g. msvc17 64 bit) by executing the command:
@@ -117,6 +117,7 @@ TRANSLATIONS += $$files($$absolute_path(nymea-app)/translations/*.ts, true)
 !equals(OVERLAY_PATH, "") {
     include($${OVERLAY_PATH}/translations.pri)
 }
+
 system("lrelease $$TRANSLATIONS")
 lrelease.commands = lrelease $$TRANSLATIONS
 QMAKE_EXTRA_TARGETS += lrelease

nymea-app/nymea-app.pro

@@ -70,9 +70,7 @@ linux:!android:!ubports: {
     SOURCES += platformintegration/generic/platformhelpergeneric.cpp
 }
 
-
 !equals(OVERLAY_PATH, "") {
-    message("Overlay enabled. Will be using overlay from $${OVERLAY_PATH}")
     include($${OVERLAY_PATH}/overlay.pri)
     DEFINES += OVERLAY_PATH=\\\"$${OVERLAY_PATH}\\\"
 } else {

nymea-app/resources.qrc

@@ -294,7 +294,6 @@
         <file>ui/mainviews/airconditioning/TimeSchedulePage.qml</file>
         <file>ui/mainviews/airconditioning/TemperatureScheduleEditor.qml</file>
         <file>ui/customviews/SensorView.qml</file>
-        <file>ui/components/MultiSelectionTabs.qml</file>
         <file>ui/mainviews/airconditioning/ZonePage.qml</file>
         <file>ui/mainviews/airconditioning/ZonesView.qml</file>
         <file>ui/mainviews/airconditioning/ACSettingsPage.qml</file>

shared.pri

@@ -12,8 +12,11 @@ APP_REVISION=$$member(VERSION_INFO, 1)
 
 equals(OVERLAY_PATH, "") {
     include(config.pri)
+    PACKAGE_BASE_DIR = $$shell_path($$PWD/packaging)
 } else {
-    include($${OVERLAY_PATH}/config.pri)
+    message("Overlay enabled. Using overlay from $${OVERLAY_PATH}")
+    include($${OVERLAY_PATH}/overlay-config.pri)
+    PACKAGE_BASE_DIR = $$shell_path($${OVERLAY_PACKAGE_DIR})
 }
 
 QMAKE_SUBSTITUTES += $${top_srcdir}/config.h.in
@@ -23,12 +26,6 @@ INCLUDEPATH += $${top_builddir}
 # On Windows, -Wall goes mental, so not using it there
 !win32:QMAKE_CXXFLAGS += -Wall
 
-equals(OVERLAY_PATH, "") {
-    PACKAGE_BASE_DIR = $$shell_path($$PWD/packaging)
-} else {
-    PACKAGE_BASE_DIR = $$shell_path($${OVERLAY_PATH}/packaging)
-}
-
 # As of Qt 5.15, lots of things are deprecated inside Qt in preparation for Qt6 but no replacement to actually fix those yet.
 linux:!android {
     QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated-copy