From 52e96eab2af5f13d0b54df03279f5bf910ad4bdc Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Tue, 18 Sep 2018 22:09:41 +0200
Subject: [PATCH] Include paths are now relative and bumped package versions

---
 DbPicSync       |  2 +-
 DbSoftware.pro  |  7 ++++---
 DbZeiterfassung |  2 +-
 project.pri     | 40 ++++++++++++++++++++--------------------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/DbPicSync b/DbPicSync
index 2a52477..562c4f4 160000
--- a/DbPicSync
+++ b/DbPicSync
@@ -1 +1 @@
-Subproject commit 2a5247743679d2eb1799bfa813a9d714e6de4296
+Subproject commit 562c4f429a463d7b7c898e291165a769b80f50f9
diff --git a/DbSoftware.pro b/DbSoftware.pro
index fd94fee..ea29037 100644
--- a/DbSoftware.pro
+++ b/DbSoftware.pro
@@ -7,9 +7,10 @@ SUBDIRS += 3rdparty \
            DbNeuralNet \
            DbPathFinder \
            DbPicSync \
-           DbRadioDumper \
-           DbSerialServer \
-           DbSketch \
+           DbRadioDumper
+qtHaveModule(serialport): SUBDIRS += DbSerialServer
+else: message("serialport is missing, will not build DbSerialServer")
+SUBDIRS += DbSketch \
            DbTernaryClock \
            DbTictactoe \
            DbWebserver \
diff --git a/DbZeiterfassung b/DbZeiterfassung
index 9f7af84..29db99a 160000
--- a/DbZeiterfassung
+++ b/DbZeiterfassung
@@ -1 +1 @@
-Subproject commit 9f7af8487fe48257811ada052d6d2c93944216cc
+Subproject commit 29db99a9182cd5067605583bbd0adef39febbfdc
diff --git a/project.pri b/project.pri
index efc6adc..5495f52 100644
--- a/project.pri
+++ b/project.pri
@@ -18,53 +18,53 @@ for(DBLIB, DBLIBS) {
     equals(DBLIB, "dbcore") {
         LIBS += -ldbcore
 
-        INCLUDEPATH += $$PWD/libs/DbCoreLib
-        DEPENDPATH += $$PWD/libs/DbCoreLib
+        INCLUDEPATH += $${PROJECT_ROOT}/libs/DbCoreLib
+        DEPENDPATH += $${PROJECT_ROOT}/libs/DbCoreLib
     } else: equals(DBLIB, "dbgui") {
         LIBS += -ldbgui
 
-        INCLUDEPATH += $$PWD/libs/DbGuiLib
-        DEPENDPATH += $$PWD/libs/DbGuiLib
+        INCLUDEPATH += $${PROJECT_ROOT}/libs/DbGuiLib
+        DEPENDPATH += $${PROJECT_ROOT}/libs/DbGuiLib
     } else: equals(DBLIB, "dbnetwork") {
         LIBS += -ldbnetwork
 
-        INCLUDEPATH += $$PWD/libs/DbNetworkLib
-        DEPENDPATH += $$PWD/libs/DbNetworkLib
+        INCLUDEPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
+        DEPENDPATH += $${PROJECT_ROOT}/libs/DbNetworkLib
     } else: equals(DBLIB, "messaginglib") {
         LIBS += -lmessaginglib
 
-        INCLUDEPATH += $$PWD/DbMessaging/messaginglib
-        DEPENDPATH += $$PWD/DbMessaging/messaginglib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
+        DEPENDPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib
     } else: equals(DBLIB, "neuralnetlib") {
         LIBS += -lneuralnetlib
 
-        INCLUDEPATH += $$PWD/DbNeuralNet/neuralnetlib
-        DEPENDPATH += $$PWD/DbNeuralNet/neuralnetlib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
+        DEPENDPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib
     } else: equals(DBLIB, "sketchlib") {
         LIBS += -lsketchlib
 
-        INCLUDEPATH += $$PWD/DbSketch/sketchlib
-        DEPENDPATH += $$PWD/DbSketch/sketchlib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
+        DEPENDPATH += $${PROJECT_ROOT}/DbSketch/sketchlib
     } else: equals(DBLIB, "webserverlib") {
         LIBS += -lwebserverlib
 
-        INCLUDEPATH += $$PWD/DbWebserver/webserverlib
-        DEPENDPATH += $$PWD/DbWebserver/webserverlib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
+        DEPENDPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib
     } else: equals(DBLIB, "zeiterfassungcore") {
         LIBS += -lzeiterfassungcore
 
-        INCLUDEPATH += $$PWD/DbZeiterfassung/zeiterfassungcorelib
-        DEPENDPATH += $$PWD/DbZeiterfassung/zeiterfassungcorelib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
+        DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib
     } else: equals(DBLIB, "zeiterfassunggui") {
         LIBS += -lzeiterfassunggui
 
-        INCLUDEPATH += $$PWD/DbZeiterfassung/zeiterfassungguilib
-        DEPENDPATH += $$PWD/DbZeiterfassung/zeiterfassungguilib
+        INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
+        DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib
     } else: equals(DBLIB, "quazip") {
         LIBS += -lquazip
 
-        INCLUDEPATH += $$PWD/3rdparty/Quazip
-        DEPENDPATH += $$PWD/3rdparty/Quazip
+        INCLUDEPATH += $${PROJECT_ROOT}/3rdparty/Quazip
+        DEPENDPATH += $${PROJECT_ROOT}/3rdparty/Quazip
     } else: message("ERROR: Unknown dblib $$DBLIB")
 }