ScStwApp.pro

@@ -1,11 +1,62 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+QT += quick qml quickcontrols2 sql multimedia
 
-SUBDIRS += \
-            ScStwLibraries \
-            ScStwStyling \
-           ScStwApp
+android {
+    QT += androidextras
+}
+VERSION = 0.04
+DEFINES += APP_VERSION=$$VERSION
+CONFIG += c++11
 
-ScStwApp.file = ScStwSrc/ScStwApp.pro
-ScStwLibraries.file =  shared-libraries/ScStwLibraries/ScStwLibraries.pro
-ScStwStyling.file =  shared-libraries/ScStwStyling/ScStwStyling.pro
+# 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
+
+TARGET = speedclimbing_stw
+
+# include submodules
+CONFIG += ScStwLibraries_QML ScStwLibraries_Styling ScStwLibraries_ClientLibs
+include($$PWD/shared-libraries/ScStwLibraries/ScStwLibraries.pri)
+
+SOURCES += \
+    sources/scstwappbackend.cpp \
+    sources/main.cpp \
+    sources/appsettings.cpp
+
+HEADERS += \
+    headers/appsettings.h \
+    headers/scstwappbackend.h
+
+RESOURCES += \
+             resources/shared/shared.qrc \
+             resources/qml/qml.qrc
+
+# 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 =
+
+#Plugins
+QTPLUGIN += qtaudio_coreaudio
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+#else: unix:!android: target.path = /opt/$${TARGET}/bin
+else: unix:!android: target.path = /home/pi/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+DISTFILES += \
+    android-sources/AndroidManifest.xml \
+    CHANGELOG \
+    android-sources/src/MainActivity.java
+
+android {
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
+}

ScStwSrc/ScStwApp.pro

@@ -1,62 +0,0 @@
-QT += quick qml quickcontrols2 sql multimedia
-
-android {
-    QT += androidextras
-}
-VERSION = 0.04
-DEFINES += APP_VERSION=$$VERSION
-CONFIG += c++11
-
-# 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
-
-TARGET = speedclimbing_stw
-
-# include submodules
-include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri)
-include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri)
-
-SOURCES += \
-    sources/scstwappbackend.cpp \
-    sources/main.cpp \
-    sources/appsettings.cpp
-
-HEADERS += \
-    headers/appsettings.h \
-    headers/scstwappbackend.h
-
-RESOURCES += \
-             resources/shared/shared.qrc \
-             resources/qml/qml.qrc
-
-# 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 =
-
-#Plugins
-QTPLUGIN += qtaudio_coreaudio
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-#else: unix:!android: target.path = /opt/$${TARGET}/bin
-else: unix:!android: target.path = /home/pi/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-DISTFILES += \
-    android-sources/AndroidManifest.xml \
-    CHANGELOG \
-    android-sources/src/MainActivity.java
-
-android {
-    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
-}

shared-libraries

@@ -1 +1 @@
-Subproject commit 549edda9b075faf900ee652f2836f27259753346
+Subproject commit ae9e6398ac233217ac89ef009fd84d8ce19f4159

sources/main.cpp

@@ -55,7 +55,6 @@
 //#include "headers/climbingrace.h"
 #include "headers/scstwappbackend.h"
 #include <scstwlibraries.h>
-#include <scstwstyling.h>
 #include <QTranslator>
 
 int main(int argc, char *argv[])
@@ -89,7 +88,7 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
     ScStwLibraries::init();
-    ScStwStyling::init(&engine);
+    ScStwLibraries::initStyling(&engine);
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));