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

Merge PR #971: Rework overlay mechanism

Browse Source
This commit is contained in:
jenkins 2023-02-14 15:36:23 +01:00
commit 432f369fcd
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app.pro
View File

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

2
nymea-app/main.cpp
View File

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

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

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