- removed subdir structure (libraries are now included directly)

ScStwMonitor.pro

@@ -1,16 +1,72 @@
-TEMPLATE = subdirs
+QT += quick multimedia
-CONFIG += ordered console
 
-SUBDIRS += \
+CONFIG += c++11
-           ScStwLibraries \
+CONFIG -= app_bundle
-           ScStwStyling \
-           ScStwMonitorSrc
 
-ScStwMonitorSrc.depends = Qt-Secret
+TARGET = ScStwMonitor
-ScStwLibraries.file = shared-libraries/ScStwLibraries/ScStwLibraries.pro
+VERSION = 1.1
-ScStwStyling.file =  shared-libraries/ScStwStyling/ScStwStyling.pro
 
-contains(QMAKE_CXX, .*raspbian.*arm.*):{
+# The following define makes your compiler emit warnings if you use
-    GLOBAL_TARGET_PATH = "/home/pi/ScStwMonitor"
+# any feature of Qt which as been marked deprecated (the exact warnings
-    cache(GLOBAL_TARGET_PATH, set)
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+        sources/main.cpp \
+        sources/scstwmonitorbackend.cpp
+
+RESOURCES += \
+        resources/qml/qml.qrc \
+        resources/shared/shared.qrc
+
+
+# include submodules
+CONFIG += ScStwLibraries_QML ScStwLibraries_Styling ScStwLibraries_ClientLibs
+include($$PWD/shared-libraries/ScStwLibraries/ScStwLibraries.pri)
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+# target path for raspi
+else: unix:!android: target.path = /usr/share/ScStwMonitor
+!isEmpty(target.path): INSTALLS += target
+
+HEADERS += \
+    headers/scstwmonitorbackend.h
+
+DISTFILES += \
+    android/AndroidManifest.xml \
+    android/build.gradle \
+    android/gradle/wrapper/gradle-wrapper.jar \
+    android/gradle/wrapper/gradle-wrapper.properties \
+    android/gradlew \
+    android/gradlew.bat \
+    android/res/values/libs.xml \
+    android/src/MainActivity.java
+
+android {
+    ANDROID_PACKAGE_SOURCE_DIR = \
+        $$PWD/android
 }
+
+ios {
+    QMAKE_ASSET_CATALOGS += icon/Assets.xcassets
+    xcode_product_bundle_identifier_setting.value = "de.itsblue.ScStwMonitor"
+
+    OBJECTIVE_SOURCES += \
+        sources/sleepprevent.mm
+    OBJECTIVE_HEADERS += \
+        headers/sleepprevent.h
+}
+

ScStwMonitorSrc/.gitignore

@@ -1,2 +0,0 @@
-*.pro.user
-*.pro.user*

ScStwMonitorSrc/ScStwMonitorSrc.pro

@@ -1,72 +0,0 @@
-QT += quick multimedia
-
-CONFIG += c++11
-CONFIG -= app_bundle
-
-TARGET = ScStwMonitor
-VERSION = 1.1
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-        sources/main.cpp \
-        sources/scstwmonitorbackend.cpp
-
-RESOURCES += \
-        resources/qml/qml.qrc \
-        resources/shared/shared.qrc
-
-
-# include submodules
-include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri)
-include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri)
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-# target path for raspi
-else: unix:!android: target.path = /usr/share/ScStwMonitor
-!isEmpty(target.path): INSTALLS += target
-
-HEADERS += \
-    headers/scstwmonitorbackend.h
-
-DISTFILES += \
-    android/AndroidManifest.xml \
-    android/build.gradle \
-    android/gradle/wrapper/gradle-wrapper.jar \
-    android/gradle/wrapper/gradle-wrapper.properties \
-    android/gradlew \
-    android/gradlew.bat \
-    android/res/values/libs.xml \
-    android/src/MainActivity.java
-
-android {
-    ANDROID_PACKAGE_SOURCE_DIR = \
-        $$PWD/android
-}
-
-ios {
-    QMAKE_ASSET_CATALOGS += icon/Assets.xcassets
-    xcode_product_bundle_identifier_setting.value = "de.itsblue.ScStwMonitor"
-
-    OBJECTIVE_SOURCES += \
-        sources/sleepprevent.mm
-    OBJECTIVE_HEADERS += \
-        headers/sleepprevent.h
-}
-

shared-libraries

@@ -1 +1 @@
-Subproject commit eb1328642db8fb194659e1ff4b53d45c1dcbc56d
+Subproject commit ae9e6398ac233217ac89ef009fd84d8ce19f4159

sources/main.cpp

@@ -24,7 +24,6 @@
 #include <QScreen>
 
 #include <scstwlibraries.h>
-#include <scstwstyling.h>
 
 #include "headers/scstwmonitorbackend.h"
 #if defined(Q_OS_IOS)
@@ -45,7 +44,7 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
 
     ScStwLibraries::init();
-    ScStwStyling::init(&engine);
+    ScStwLibraries::initStyling(&engine);
 
     QSize size = app.screens().first()->size();
     engine.rootContext()->setContextProperty("XscreenHeight", size.height());