From 77a66123f2da459c7b19a80018cdd42ddb9ea69b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 29 Jun 2021 13:50:02 +0200 Subject: [PATCH] Allow including cpp sources in the overlay --- nymea-app/main.cpp | 8 ++++++++ nymea-app/nymea-app.pro | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index b375eb50..70025ba2 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -53,6 +53,10 @@ #include "logging.h" +#ifdef OVERLAY_QMLTYPES +#include OVERLAY_QMLTYPES +#endif + NYMEA_LOGGING_CATEGORY(dcApplication, "Application") NYMEA_LOGGING_CATEGORY(qml, "qml") @@ -164,6 +168,10 @@ int main(int argc, char *argv[]) qmlRegisterType("Nymea", 1, 0, "MouseObserver"); +#ifdef OVERLAY_QMLTYPES + registerOverlayTypes("Nymea", 1, 0); +#endif + engine->rootContext()->setContextProperty("appVersion", APP_VERSION); engine->rootContext()->setContextProperty("qtBuildVersion", QT_VERSION_STR); engine->rootContext()->setContextProperty("qtVersion", qVersion()); diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 4137ead0..0bbb7c8e 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -55,6 +55,12 @@ RESOURCES += resources.qrc \ !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) + DEFINES += OVERLAY_QMLTYPES=\\\"$${OVERLAY_PATH}/src/qmltypes.h\\\" + } } else { RESOURCES += styles.qrc }