From da9df30cafc5a8a5e24544c88d00ad3041c06a5a Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Mon, 17 Sep 2018 20:28:35 +0200 Subject: [PATCH] Updated packages to new versions and added dbnetworklib --- .gitmodules | 3 +++ DbWebserver | 2 +- DbZeiterfassung | 2 +- libs/DbCoreLib | 2 +- libs/DbNetworkLib | 1 + libs/libs.pro | 1 + project.pri | 5 +++++ 7 files changed, 13 insertions(+), 3 deletions(-) create mode 160000 libs/DbNetworkLib diff --git a/.gitmodules b/.gitmodules index c33b944..2d29ba9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "DbZeiterfassung"] path = DbZeiterfassung url = https://github.com/0xFEEDC0DE64/DbZeiterfassung.git +[submodule "libs/DbNetworkLib"] + path = libs/DbNetworkLib + url = https://github.com/0xFEEDC0DE64/DbNetworkLib.git diff --git a/DbWebserver b/DbWebserver index 3426433..c611917 160000 --- a/DbWebserver +++ b/DbWebserver @@ -1 +1 @@ -Subproject commit 3426433a22b4e7f3bce3acea9075e8796f8131c7 +Subproject commit c611917d9aa989d42c60820ced7d251b1a2879a4 diff --git a/DbZeiterfassung b/DbZeiterfassung index 3081d7d..09141b1 160000 --- a/DbZeiterfassung +++ b/DbZeiterfassung @@ -1 +1 @@ -Subproject commit 3081d7de2dd639665fbdea602c6138ab18b63d35 +Subproject commit 09141b1a5900207103ead2b2e2e1d07d1b7519f1 diff --git a/libs/DbCoreLib b/libs/DbCoreLib index 56ce99e..b854af7 160000 --- a/libs/DbCoreLib +++ b/libs/DbCoreLib @@ -1 +1 @@ -Subproject commit 56ce99e0e942d8fcb6b59fd521a475cf4b9011e5 +Subproject commit b854af7dc6bb17046ca4deb212ec2f1ab88815a9 diff --git a/libs/DbNetworkLib b/libs/DbNetworkLib new file mode 160000 index 0000000..ad8a80a --- /dev/null +++ b/libs/DbNetworkLib @@ -0,0 +1 @@ +Subproject commit ad8a80ac9b2b50ea37c5ff43eb14f5aa433e8582 diff --git a/libs/libs.pro b/libs/libs.pro index 21793a5..c280450 100644 --- a/libs/libs.pro +++ b/libs/libs.pro @@ -2,6 +2,7 @@ TEMPLATE = subdirs SUBDIRS += DbCoreLib \ DbGuiLib \ + DbNetworkLib \ unittests unittests.depends += DbCoreLib diff --git a/project.pri b/project.pri index 3aec67b..efc6adc 100644 --- a/project.pri +++ b/project.pri @@ -25,6 +25,11 @@ for(DBLIB, DBLIBS) { INCLUDEPATH += $$PWD/libs/DbGuiLib DEPENDPATH += $$PWD/libs/DbGuiLib + } else: equals(DBLIB, "dbnetwork") { + LIBS += -ldbnetwork + + INCLUDEPATH += $$PWD/libs/DbNetworkLib + DEPENDPATH += $$PWD/libs/DbNetworkLib } else: equals(DBLIB, "messaginglib") { LIBS += -lmessaginglib