ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update overlay loading mechanism

Browse Source
This commit is contained in:
Simon Stürz 2025-02-04 15:04:32 +01:00
parent 4331c3f547
commit 30fbe16f82
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nymea-app.pro
View File

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

2
nymea-app/nymea-app.pro
View File

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

1
nymea-app/resources.qrc
View File

@ -294,7 +294,6 @@
<file>ui/mainviews/airconditioning/TimeSchedulePage.qml</file> <file>ui/mainviews/airconditioning/TimeSchedulePage.qml</file>
<file>ui/mainviews/airconditioning/TemperatureScheduleEditor.qml</file> <file>ui/mainviews/airconditioning/TemperatureScheduleEditor.qml</file>
<file>ui/customviews/SensorView.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/ZonePage.qml</file>
<file>ui/mainviews/airconditioning/ZonesView.qml</file> <file>ui/mainviews/airconditioning/ZonesView.qml</file>
<file>ui/mainviews/airconditioning/ACSettingsPage.qml</file> <file>ui/mainviews/airconditioning/ACSettingsPage.qml</file>

11
shared.pri
View File

@ -12,8 +12,11 @@ APP_REVISION=$$member(VERSION_INFO, 1)
equals(OVERLAY_PATH, "") { equals(OVERLAY_PATH, "") {
include(config.pri) include(config.pri)
PACKAGE_BASE_DIR = $$shell_path($$PWD/packaging)
} else { } 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 QMAKE_SUBSTITUTES += $${top_srcdir}/config.h.in
@ -23,12 +26,6 @@ INCLUDEPATH += $${top_builddir}
# On Windows, -Wall goes mental, so not using it there # On Windows, -Wall goes mental, so not using it there
!win32:QMAKE_CXXFLAGS += -Wall !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. # 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 { linux:!android {
QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated-copy QMAKE_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated-copy