From d430ba1a5e52b23f8ff156c8aaf8f1f7b6a3150d Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Thu, 20 Sep 2018 18:48:12 +0200
Subject: [PATCH] Fixed project dependencies

---
 DbSerialServer |  2 +-
 DbSoftware.pro |  1 +
 project.pri    | 24 ++++++++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/DbSerialServer b/DbSerialServer
index fe4c3c5..74a9c59 160000
--- a/DbSerialServer
+++ b/DbSerialServer
@@ -1 +1 @@
-Subproject commit fe4c3c52fb4128d29e780dd2b08b176bb299c102
+Subproject commit 74a9c597ba625e05adebc5b57e98b2f65fc047e9
diff --git a/DbSoftware.pro b/DbSoftware.pro
index ea29037..e6cead7 100644
--- a/DbSoftware.pro
+++ b/DbSoftware.pro
@@ -21,6 +21,7 @@ OTHER_FILES += app.pri \
                lib.pri \
                project.pri
 
+contains(SUBDIRS, DbSerialServer): DbSerialServer.depends += libs
 DbSketch.depends += 3rdparty
 DbTernaryClock.depends += libs
 DbWebserver.depends += libs
diff --git a/project.pri b/project.pri
index 5495f52..af9a653 100644
--- a/project.pri
+++ b/project.pri
@@ -14,53 +14,57 @@ DEFINES += QT_DEPRECATED_WARNINGS \
     else: LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib -L$${OUT_PWD}/$${PROJECT_ROOT}/lib
 }
 
+contains(DBLIBS, sketchlib): DBLIBS *= quazip
+contains(DBLIBS, webserverlib): DBLIBS *= dbnetwork
+contains(DBLIBS, zeiterfassunggui): DBLIBS *= dbcore
+
 for(DBLIB, DBLIBS) {
-    equals(DBLIB, "dbcore") {
+    equals(DBLIB, dbcore) {
         LIBS += -ldbcore
 
         INCLUDEPATH += $${PROJECT_ROOT}/libs/DbCoreLib
         DEPENDPATH += $${PROJECT_ROOT}/libs/DbCoreLib
-    } else: equals(DBLIB, "dbgui") {
+    } else: equals(DBLIB, dbgui) {
         LIBS += -ldbgui
 
         INCLUDEPATH += $${PROJECT_ROOT}/libs/DbGuiLib
         DEPENDPATH += $${PROJECT_ROOT}/libs/DbGuiLib
-    } else: equals(DBLIB, "dbnetwork") {
+    } else: equals(DBLIB, dbnetwork) {
         LIBS += -ldbnetwork
 
         INCLUDEPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
         DEPENDPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
-    } else: equals(DBLIB, "messaginglib") {
+    } else: equals(DBLIB, messaginglib) {
         LIBS += -lmessaginglib
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
         DEPENDPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
-    } else: equals(DBLIB, "neuralnetlib") {
+    } else: equals(DBLIB, neuralnetlib) {
         LIBS += -lneuralnetlib
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
         DEPENDPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
-    } else: equals(DBLIB, "sketchlib") {
+    } else: equals(DBLIB, sketchlib) {
         LIBS += -lsketchlib
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
         DEPENDPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
-    } else: equals(DBLIB, "webserverlib") {
+    } else: equals(DBLIB, webserverlib) {
         LIBS += -lwebserverlib
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
         DEPENDPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
-    } else: equals(DBLIB, "zeiterfassungcore") {
+    } else: equals(DBLIB, zeiterfassungcore) {
         LIBS += -lzeiterfassungcore
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
         DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
-    } else: equals(DBLIB, "zeiterfassunggui") {
+    } else: equals(DBLIB, zeiterfassunggui) {
         LIBS += -lzeiterfassunggui
 
         INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
         DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
-    } else: equals(DBLIB, "quazip") {
+    } else: equals(DBLIB, quazip) {
         LIBS += -lquazip
 
         INCLUDEPATH += $${PROJECT_ROOT}/3rdparty/Quazip