feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Removed the need for a start script under unix

Browse Source
This commit is contained in:
0xFEEDC0DE64
2018-04-11 19:29:17 +01:00
parent 7294a6d237
commit 0eb0cb5473
18 changed files with 73 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lrelease.pri
View File

@@ -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

16
plugins/absenceplugin/absenceplugin.pro
View File

@@ -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)

16
plugins/advancedviewplugin/advancedviewplugin.pro
View File

@@ -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)

16
plugins/devtoolsplugin/devtoolsplugin.pro
View File

@@ -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)

16
plugins/lunchmealplugin/lunchmealplugin.pro
View File

@@ -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)

9
plugins/plugin.pri Normal file
View File

@@ -0,0 +1,9 @@
TEMPLATE = lib
CONFIG += shared
PROJECT_ROOT = ../..
include(../project.pri)
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung

16
plugins/presenceplugin/presenceplugin.pro
View File

@@ -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)

16
plugins/profileplugin/profileplugin.pro
View File

@@ -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)

16
plugins/reportsplugin/reportsplugin.pro
View File

@@ -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)

16
plugins/updaterplugin/updaterplugin.pro
View File

@@ -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)

16
plugins/weatherplugin/weatherplugin.pro
View File

@@ -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)

16
plugins/webradioplugin/webradioplugin.pro
View File

@@ -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)

39
project.pri Normal file
View File

@@ -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

3
zeiterfassung/installs_unix.pri
View File

@@ -1,3 +0,0 @@
scriptsInstall.path = $${DESTDIR}
scriptsInstall.files = unix/zeiterfassung.sh
INSTALLS += scriptsInstall

3
zeiterfassung/unix/zeiterfassung.sh
View File

@@ -1,3 +0,0 @@
#!/bin/bash
cd "${0%/*}"
LD_LIBRARY_PATH=. ./zeiterfassung

11
zeiterfassung/zeiterfassung.pro
View File

@@ -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)

7
zeiterfassungcorelib/zeiterfassungcorelib.pro
View File

@@ -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)

12
zeiterfassungguilib/zeiterfassungguilib.pro
View File

@@ -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)