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

Continuous integration #52

Merged
0xFEEDC0DE64 merged 10 commits from continuous-integration into devel 2017-12-26 16:40:54 +01:00
Conversation 0 Commits 10 Files Changed 24 +96 -147
19 changed files with 96 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c8671b5417 - Show all commits

4
lrelease.pri
View File

@@ -4,8 +4,8 @@ isEmpty(QMAKE_LRELEASE) {
}
lrelease.input = TRANSLATIONS
lrelease.output = $${OUT_PWD}/translations/${QMAKE_FILE_BASE}.qm
lrelease.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
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

15
plugins/advancedviewplugin/advancedviewplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -42,8 +44,3 @@ TRANSLATIONS += translations/advancedviewplugin_en.ts \
OTHER_FILES += advancedviewplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/advancedviewplugin_en.qm \
$${OUT_PWD}/translations/advancedviewplugin_de.qm
include(../copy_translations.pri)

6
plugins/copy_translations.pri
View File

@@ -1,6 +0,0 @@
copy_compiled_translations.input = COMPILED_TRANSLATIONS
copy_compiled_translations.output = $${OUT_PWD}/../../bin/translations/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_compiled_translations.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_compiled_translations.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_compiled_translations
PRE_TARGETDEPS += compiler_copy_compiled_translations_make_all

15
plugins/devtoolsplugin/devtoolsplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -32,8 +34,3 @@ TRANSLATIONS += translations/devtoolsplugin_en.ts \
OTHER_FILES += devtoolsplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/devtoolsplugin_en.qm \
$${OUT_PWD}/translations/devtoolsplugin_de.qm
include(../copy_translations.pri)

15
plugins/lunchmealplugin/lunchmealplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -32,8 +34,3 @@ TRANSLATIONS += translations/lunchmealplugin_en.ts \
OTHER_FILES += lunchmealplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/lunchmealplugin_en.qm \
$${OUT_PWD}/translations/lunchmealplugin_de.qm
include(../copy_translations.pri)

15
plugins/presenceplugin/presenceplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/presenceplugin_en.ts \
OTHER_FILES += presenceplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/presenceplugin_en.qm \
$${OUT_PWD}/translations/presenceplugin_de.qm
include(../copy_translations.pri)

15
plugins/profileplugin/profileplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/profileplugin_en.ts \
OTHER_FILES += profileplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/profileplugin_en.qm \
$${OUT_PWD}/translations/profileplugin_de.qm
include(../copy_translations.pri)

15
plugins/reportsplugin/reportsplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/reportsplugin_en.ts \
OTHER_FILES += reportsplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/reportsplugin_en.qm \
$${OUT_PWD}/translations/reportsplugin_de.qm
include(../copy_translations.pri)

15
plugins/updaterplugin/updaterplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/updaterplugin_en.ts \
OTHER_FILES += updaterplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/updaterplugin_en.qm \
$${OUT_PWD}/translations/updaterplugin_de.qm
include(../copy_translations.pri)

15
plugins/weatherplugin/weatherplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/weatherplugin_en.ts \
OTHER_FILES += weatherplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/weatherplugin_en.qm \
$${OUT_PWD}/translations/weatherplugin_de.qm
include(../copy_translations.pri)

15
plugins/webradioplugin/webradioplugin.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += shared c++14
DESTDIR = $${OUT_PWD}/../../bin/plugins/zeiterfassung
PROJECT_ROOT = ../..
LIBS += -L$$OUT_PWD/../../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin/plugins/zeiterfassung
INCLUDEPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
DEPENDPATH += $$PWD/../../zeiterfassungcorelib $$PWD/../../zeiterfassungguilib
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
@@ -30,8 +32,3 @@ TRANSLATIONS += translations/webradioplugin_en.ts \
OTHER_FILES += webradioplugin.json
include(../../lrelease.pri)
COMPILED_TRANSLATIONS += $${OUT_PWD}/translations/webradioplugin_en.qm \
$${OUT_PWD}/translations/webradioplugin_de.qm
include(../copy_translations.pri)

16
zeiterfassung/installs.pri
View File

@@ -9,17 +9,11 @@ COMPILED_TRANSLATIONS += $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm \
$${OUT_PWD}/translations/zeiterfassung_en.qm \
$${OUT_PWD}/translations/zeiterfassung_de.qm \
$${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_en.qm \
$${OUT_PWD}/../zeiterfassungcorelib/translations/zeiterfassungcorelib_de.qm \
$${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_en.qm \
$${OUT_PWD}/../zeiterfassungguilib/translations/zeiterfassungguilib_de.qm
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm
copy_compiled_translations.input = COMPILED_TRANSLATIONS
copy_compiled_translations.output = $${DESTDIR}/translations/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_compiled_translations.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_compiled_translations.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_compiled_translations.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_compiled_translations
PRE_TARGETDEPS += compiler_copy_compiled_translations_make_all
@@ -28,7 +22,7 @@ THEMES += themes/dark_theme.qss
copy_themes.input = THEMES
copy_themes.output = $${DESTDIR}/themes/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_themes.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_themes.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_themes.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_themes
PRE_TARGETDEPS += compiler_copy_themes_make_all
@@ -76,7 +70,7 @@ DARK_THEME_RESOURCES += themes/dark_theme/checkbox_indeterminate_disabled.png \
copy_dark_theme_resouces.input = DARK_THEME_RESOURCES
copy_dark_theme_resouces.output = $${DESTDIR}/themes/dark_theme/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_dark_theme_resouces.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_dark_theme_resouces.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_dark_theme_resouces.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_dark_theme_resouces
PRE_TARGETDEPS += compiler_copy_dark_theme_resouces_make_all
@@ -87,7 +81,7 @@ STRIPLAYOUTS += strips/bookingstartstrip.ui \
copy_striplayouts.input = STRIPLAYOUTS
copy_striplayouts.output = $${DESTDIR}/strips/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_striplayouts.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_striplayouts.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_striplayouts.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_striplayouts
PRE_TARGETDEPS += compiler_copy_striplayouts_make_all

2
zeiterfassung/installs_unix.pri
View File

@@ -2,7 +2,7 @@ SCRIPTS += unix/start.sh
copy_scripts.input = SCRIPTS
copy_scripts.output = $${DESTDIR}/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_scripts.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_scripts.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_scripts.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_scripts
PRE_TARGETDEPS += compiler_copy_scripts_make_all

8
zeiterfassung/installs_win32.pri
View File

@@ -1,8 +1,6 @@
CONFIG(debug, release|debug): DEBUG_SIGN = d
LIBRARIES += win32/Qt.conf \
$$OUT_PWD/../lib/zeiterfassungcorelib.dll \
$$OUT_PWD/../lib/zeiterfassungguilib.dll \
$$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \
$$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \
$$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \
@@ -13,7 +11,7 @@ LIBRARIES += win32/Qt.conf \
copy_libraries.input = LIBRARIES
copy_libraries.output = $${DESTDIR}/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_libraries.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_libraries.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_libraries.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_libraries
PRE_TARGETDEPS += compiler_copy_libraries_make_all
@@ -30,7 +28,7 @@ IMAGE_FORMATS += $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \
copy_image_formats.input = IMAGE_FORMATS
copy_image_formats.output = $${DESTDIR}/plugins/imageformats/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_image_formats.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_image_formats.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_image_formats.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_image_formats
PRE_TARGETDEPS += compiler_copy_image_formats_make_all
@@ -39,7 +37,7 @@ PLATFORMS += $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll
copy_platforms.input = PLATFORMS
copy_platforms.output = $${DESTDIR}/plugins/platforms/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
copy_platforms.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_platforms.commands = $${QMAKE_COPY} ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy_platforms.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy_platforms
PRE_TARGETDEPS += compiler_copy_platforms_make_all

2
zeiterfassung/unix/start.sh
View File

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

12
zeiterfassung/zeiterfassung.pro
View File

@@ -6,12 +6,14 @@ TEMPLATE = app
CONFIG += c++14
CONFIG -= app_bundle
DESTDIR = $${OUT_PWD}/../bin
PROJECT_ROOT = ..
LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib -lzeiterfassungguilib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
INCLUDEPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib
DEPENDPATH += $$PWD/../zeiterfassungcorelib $$PWD/../zeiterfassungguilib
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
@@ -30,7 +32,7 @@ RESOURCES += zeiterfassung_resources.qrc
TRANSLATIONS += translations/zeiterfassung_en.ts \
translations/zeiterfassung_de.ts
include(../lrelease.pri)
include($${PROJECT_ROOT}/lrelease.pri)
include(installs.pri)
unix: include(installs_unix.pri)

11
zeiterfassungcorelib/zeiterfassungcorelib.pro
View File

@@ -6,7 +6,9 @@ TEMPLATE = lib
CONFIG += c++14
DESTDIR = $${OUT_PWD}/../lib
PROJECT_ROOT = ..
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
DEFINES += ZEITERFASSUNGCORELIB_LIBRARY
@@ -58,9 +60,4 @@ RESOURCES +=
TRANSLATIONS += translations/zeiterfassungcorelib_en.ts \
translations/zeiterfassungcorelib_de.ts
include(../lrelease.pri)
# unix {
# target.path = /usr/lib
# INSTALLS += target
# }
include($${PROJECT_ROOT}/lrelease.pri)

17
zeiterfassungguilib/zeiterfassungguilib.pro
View File

@@ -5,12 +5,14 @@ TEMPLATE = lib
CONFIG += c++14
DESTDIR = $${OUT_PWD}/../lib
PROJECT_ROOT = ..
LIBS += -L$$OUT_PWD/../lib -lzeiterfassungcorelib
DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
INCLUDEPATH += $$PWD/../zeiterfassungcorelib
DEPENDPATH += $$PWD/../zeiterfassungcorelib
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
@@ -42,9 +44,4 @@ RESOURCES += zeiterfassungguilib_resources.qrc
TRANSLATIONS += translations/zeiterfassungguilib_en.ts \
translations/zeiterfassungguilib_de.ts
include(../lrelease.pri)
# unix {
# target.path = /usr/lib
# INSTALLS += target
# }
include($${PROJECT_ROOT}/lrelease.pri)