From 0eb0cb5473c0e2fe45336a6681ffe2b02a4e53ac Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Wed, 11 Apr 2018 19:29:17 +0100 Subject: [PATCH] Removed the need for a start script under unix --- lrelease.pri | 11 ------ plugins/absenceplugin/absenceplugin.pro | 16 +------- .../advancedviewplugin/advancedviewplugin.pro | 16 +------- plugins/devtoolsplugin/devtoolsplugin.pro | 16 +------- plugins/lunchmealplugin/lunchmealplugin.pro | 16 +------- plugins/plugin.pri | 9 +++++ plugins/presenceplugin/presenceplugin.pro | 16 +------- plugins/profileplugin/profileplugin.pro | 16 +------- plugins/reportsplugin/reportsplugin.pro | 16 +------- plugins/updaterplugin/updaterplugin.pro | 16 +------- plugins/weatherplugin/weatherplugin.pro | 16 +------- plugins/webradioplugin/webradioplugin.pro | 16 +------- project.pri | 39 +++++++++++++++++++ zeiterfassung/installs_unix.pri | 3 -- zeiterfassung/unix/zeiterfassung.sh | 3 -- zeiterfassung/zeiterfassung.pro | 11 +----- zeiterfassungcorelib/zeiterfassungcorelib.pro | 7 +--- zeiterfassungguilib/zeiterfassungguilib.pro | 12 +----- 18 files changed, 73 insertions(+), 182 deletions(-) delete mode 100644 lrelease.pri create mode 100644 plugins/plugin.pri create mode 100644 project.pri delete mode 100644 zeiterfassung/installs_unix.pri delete mode 100755 zeiterfassung/unix/zeiterfassung.sh diff --git a/lrelease.pri b/lrelease.pri deleted file mode 100644 index a17903f..0000000 --- a/lrelease.pri +++ /dev/null @@ -1,11 +0,0 @@ -isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease -} - -lrelease.input = TRANSLATIONS -lrelease.output = $${OUT_PWD}/$${PROJECT_ROOT}/bin/translations/${QMAKE_FILE_BASE}.qm -lrelease.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -lrelease.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += lrelease -PRE_TARGETDEPS += compiler_lrelease_make_all diff --git a/plugins/absenceplugin/absenceplugin.pro b/plugins/absenceplugin/absenceplugin.pro index b0206c7..5e0eb4f 100644 --- a/plugins/absenceplugin/absenceplugin.pro +++ b/plugins/absenceplugin/absenceplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = absenceplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += absencedialog.h \ absencesmodel.h \ @@ -35,4 +23,4 @@ TRANSLATIONS += translations/absenceplugin_en.ts \ OTHER_FILES += absenceplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/advancedviewplugin/advancedviewplugin.pro b/plugins/advancedviewplugin/advancedviewplugin.pro index 6c90247..dcaa527 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.pro +++ b/plugins/advancedviewplugin/advancedviewplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = advancedviewplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += advancedviewdialog.h \ advancedviewplugin.h \ @@ -43,4 +31,4 @@ TRANSLATIONS += translations/advancedviewplugin_en.ts \ OTHER_FILES += advancedviewplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/devtoolsplugin/devtoolsplugin.pro b/plugins/devtoolsplugin/devtoolsplugin.pro index 1b84eea..bf24d6a 100644 --- a/plugins/devtoolsplugin/devtoolsplugin.pro +++ b/plugins/devtoolsplugin/devtoolsplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = devtoolsplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += devtoolsplugin.h \ logdialog.h \ @@ -33,4 +21,4 @@ TRANSLATIONS += translations/devtoolsplugin_en.ts \ OTHER_FILES += devtoolsplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index a786a82..8376b1f 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = lunchmealplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += lunchmealdialog.h \ lunchmealsettings.h \ @@ -37,4 +25,4 @@ TRANSLATIONS += translations/lunchmealplugin_en.ts \ OTHER_FILES += lunchmealplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/plugin.pri b/plugins/plugin.pri new file mode 100644 index 0000000..e069ff8 --- /dev/null +++ b/plugins/plugin.pri @@ -0,0 +1,9 @@ +TEMPLATE = lib + +CONFIG += shared + +PROJECT_ROOT = ../.. + +include(../project.pri) + +DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung diff --git a/plugins/presenceplugin/presenceplugin.pro b/plugins/presenceplugin/presenceplugin.pro index 302ff93..6bb4c79 100644 --- a/plugins/presenceplugin/presenceplugin.pro +++ b/plugins/presenceplugin/presenceplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = presenceplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += presenceplugin.h \ presencewidget.h \ @@ -35,4 +23,4 @@ TRANSLATIONS += translations/presenceplugin_en.ts \ OTHER_FILES += presenceplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/profileplugin/profileplugin.pro b/plugins/profileplugin/profileplugin.pro index c48fefd..1bf3077 100644 --- a/plugins/profileplugin/profileplugin.pro +++ b/plugins/profileplugin/profileplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = profileplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += profiledialog.h \ profileplugin.h @@ -31,4 +19,4 @@ TRANSLATIONS += translations/profileplugin_en.ts \ OTHER_FILES += profileplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/reportsplugin/reportsplugin.pro b/plugins/reportsplugin/reportsplugin.pro index b502ce4..d76802d 100644 --- a/plugins/reportsplugin/reportsplugin.pro +++ b/plugins/reportsplugin/reportsplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = reportsplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += reportsplugin.h \ reportswidget.h @@ -31,4 +19,4 @@ TRANSLATIONS += translations/reportsplugin_en.ts \ OTHER_FILES += reportsplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/updaterplugin/updaterplugin.pro b/plugins/updaterplugin/updaterplugin.pro index 68e3210..3cd325d 100644 --- a/plugins/updaterplugin/updaterplugin.pro +++ b/plugins/updaterplugin/updaterplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = updaterplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += updaterdialog.h \ updaterplugin.h \ @@ -35,4 +23,4 @@ TRANSLATIONS += translations/updaterplugin_en.ts \ OTHER_FILES += updaterplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/weatherplugin/weatherplugin.pro b/plugins/weatherplugin/weatherplugin.pro index 2fb4997..1bd8178 100644 --- a/plugins/weatherplugin/weatherplugin.pro +++ b/plugins/weatherplugin/weatherplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets TARGET = weatherplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += weatherplugin.h \ weathersettings.h \ @@ -35,4 +23,4 @@ TRANSLATIONS += translations/weatherplugin_en.ts \ OTHER_FILES += weatherplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/plugins/webradioplugin/webradioplugin.pro b/plugins/webradioplugin/webradioplugin.pro index 8f7de0b..364ed49 100644 --- a/plugins/webradioplugin/webradioplugin.pro +++ b/plugins/webradioplugin/webradioplugin.pro @@ -1,20 +1,8 @@ QT += core network gui widgets multimedia TARGET = webradioplugin -TEMPLATE = lib -CONFIG += shared c++14 - -PROJECT_ROOT = ../.. - -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung - -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui HEADERS += webradiodialog.h \ webradioplugin.h \ @@ -35,4 +23,4 @@ TRANSLATIONS += translations/webradioplugin_en.ts \ OTHER_FILES += webradioplugin.json -include($${PROJECT_ROOT}/lrelease.pri) +include(../plugin.pri) diff --git a/project.pri b/project.pri new file mode 100644 index 0000000..cdd906d --- /dev/null +++ b/project.pri @@ -0,0 +1,39 @@ +CONFIG += c++14 + +DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT + +equals(TEMPLATE, "lib") { + win32: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin + else: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/lib +} + +!isEmpty(DBLIBS) { + win32: LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin + else: LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib -L$${OUT_PWD}/$${PROJECT_ROOT}/lib +} + +contains(DBLIBS, core) { + LIBS += -lzeiterfassungcorelib + + INCLUDEPATH += $$PWD/zeiterfassungcorelib + DEPENDPATH += $$PWD/zeiterfassungcorelib +} + +contains(DBLIBS, gui) { + LIBS += -lzeiterfassungguilib + + INCLUDEPATH += $$PWD/zeiterfassungguilib + DEPENDPATH += $$PWD/zeiterfassungguilib +} + +isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease +} + +lrelease.input = TRANSLATIONS +lrelease.output = $${OUT_PWD}/$${PROJECT_ROOT}/bin/translations/${QMAKE_FILE_BASE}.qm +lrelease.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} +lrelease.CONFIG += no_link +QMAKE_EXTRA_COMPILERS += lrelease +PRE_TARGETDEPS += compiler_lrelease_make_all diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri deleted file mode 100644 index 26f2133..0000000 --- a/zeiterfassung/installs_unix.pri +++ /dev/null @@ -1,3 +0,0 @@ -scriptsInstall.path = $${DESTDIR} -scriptsInstall.files = unix/zeiterfassung.sh -INSTALLS += scriptsInstall diff --git a/zeiterfassung/unix/zeiterfassung.sh b/zeiterfassung/unix/zeiterfassung.sh deleted file mode 100755 index 29ab530..0000000 --- a/zeiterfassung/unix/zeiterfassung.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd "${0%/*}" -LD_LIBRARY_PATH=. ./zeiterfassung diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index 506e989..98d5fbc 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -3,19 +3,13 @@ QT += core network gui widgets TARGET = zeiterfassung TEMPLATE = app -CONFIG += c++14 CONFIG -= app_bundle PROJECT_ROOT = .. DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin -LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin -lzeiterfassungcorelib -lzeiterfassungguilib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT +DBLIBS += core gui RC_ICONS = icon.ico @@ -32,7 +26,6 @@ RESOURCES += zeiterfassung_resources.qrc TRANSLATIONS += translations/zeiterfassung_en.ts \ translations/zeiterfassung_de.ts -include($${PROJECT_ROOT}/lrelease.pri) +include($${PROJECT_ROOT}/project.pri) include(installs.pri) -unix: include(installs_unix.pri) diff --git a/zeiterfassungcorelib/zeiterfassungcorelib.pro b/zeiterfassungcorelib/zeiterfassungcorelib.pro index 9ba114a..ad1b953 100644 --- a/zeiterfassungcorelib/zeiterfassungcorelib.pro +++ b/zeiterfassungcorelib/zeiterfassungcorelib.pro @@ -4,13 +4,8 @@ QT -= gui widgets TARGET = zeiterfassungcorelib TEMPLATE = lib -CONFIG += c++14 - PROJECT_ROOT = .. -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += ZEITERFASSUNGCORELIB_LIBRARY SOURCES += timeutils.cpp \ @@ -62,4 +57,4 @@ RESOURCES += TRANSLATIONS += translations/zeiterfassungcorelib_en.ts \ translations/zeiterfassungcorelib_de.ts -include($${PROJECT_ROOT}/lrelease.pri) +include($${PROJECT_ROOT}/project.pri) diff --git a/zeiterfassungguilib/zeiterfassungguilib.pro b/zeiterfassungguilib/zeiterfassungguilib.pro index 15c428a..002093b 100644 --- a/zeiterfassungguilib/zeiterfassungguilib.pro +++ b/zeiterfassungguilib/zeiterfassungguilib.pro @@ -3,18 +3,10 @@ QT += core network gui widgets uitools TARGET = zeiterfassungguilib TEMPLATE = lib -CONFIG += c++14 - PROJECT_ROOT = .. -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin +DBLIBS += core -LIBS += -L$$DESTDIR -lzeiterfassungcorelib - -INCLUDEPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib -DEPENDPATH += $$PWD/$${PROJECT_ROOT}/zeiterfassungcorelib $$PWD/$${PROJECT_ROOT}/zeiterfassungguilib - -DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT DEFINES += ZEITERFASSUNGGUILIB_LIBRARY SOURCES += mainwindow.cpp \ @@ -48,6 +40,6 @@ RESOURCES += zeiterfassungguilib_resources.qrc TRANSLATIONS += translations/zeiterfassungguilib_en.ts \ translations/zeiterfassungguilib_de.ts -include($${PROJECT_ROOT}/lrelease.pri) +include($${PROJECT_ROOT}/project.pri) include(QStringListWidget/QStringListWidget.pri)