diff --git a/.travis.yml b/.travis.yml index 63aeed6..0d8c2a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,25 @@ language: cpp -os: - - linux +os: linux +sudo: false dist: trusty -compiler: - - gcc +compiler: gcc -before_install: - -install: +cache: + directories: + - qt5 before_script: - - if [ ! -d qt5 ] - - then - - git clone --branch=5.10 git://code.qt.io/qt/qt5.git + - mkdir -p qt5 + - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.10 git://code.qt.io/qt/qt5.git ; fi - pushd qt5 - - perl init-repository --module-subset=qtbase,qtimageformats - - ./configure -static -opensource -nomake examples -nomake tests -confirm-license - - make -j2 - - sudo make install + - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qtmultimedia,qttools ; fi + - if [ ! -f config.summary ] ; then ./configure -prefix `pwd`/build -opensource -confirm-license -nomake examples -nomake tests ; fi + - if [ ! -d build ] ; then make -j2 > /dev/null && make install ; fi - popd - - fi script: - - which qmake - - which lrelease - mkdir -p build - pushd build - - qmake .. -config release + - ../qt5/build/bin/qmake .. -config release - make -j2 - popd \ No newline at end of file diff --git a/zeiterfassung.pro b/QtZeiterfassung.pro similarity index 83% rename from zeiterfassung.pro rename to QtZeiterfassung.pro index fed8288..17025d9 100644 --- a/zeiterfassung.pro +++ b/QtZeiterfassung.pro @@ -8,3 +8,6 @@ SUBDIRS += plugins \ plugins.depends += zeiterfassungguilib zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib zeiterfassungguilib.depends += zeiterfassungcorelib + +include(installs.pri) +win32: include(installs_win32.pri) diff --git a/installs.pri b/installs.pri new file mode 100644 index 0000000..3a7ab5d --- /dev/null +++ b/installs.pri @@ -0,0 +1,14 @@ +qtTranslationsInstalls.path = $${OUT_PWD}/bin/translations +qtTranslationsInstalls.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtscript_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ + $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.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 +INSTALLS += qtTranslationsInstalls diff --git a/installs_win32.pri b/installs_win32.pri new file mode 100644 index 0000000..65ce4a7 --- /dev/null +++ b/installs_win32.pri @@ -0,0 +1,28 @@ +CONFIG(debug, release|debug): DEBUG_SIGN = d + +qtLibsInstall.path = $${OUT_PWD}/bin +qtLibsInstall.files = win32/Qt.conf \ + $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ + $$[QT_INSTALL_BINS]/libstdc++-6.dll \ + $$[QT_INSTALL_BINS]/libwinpthread-1.dll +INSTALLS += qtLibsInstall + +qtImageFormats.path = $${OUT_PWD}/bin/plugins/imageformats +qtImageFormats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ + $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DEBUG_SIGN}.dll +INSTALLS += qtImageFormats + +qtPlatformsInstall.path = $${OUT_PWD}/bin/plugins/platforms +qtPlatformsInstall.files = $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll +INSTALLS += qtPlatformsInstall diff --git a/lrelease.pri b/lrelease.pri index a0ad8fa..a17903f 100644 --- a/lrelease.pri +++ b/lrelease.pri @@ -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 diff --git a/plugins/advancedviewplugin/advancedviewplugin.pro b/plugins/advancedviewplugin/advancedviewplugin.pro index 58a31f5..6c89a24 100644 --- a/plugins/advancedviewplugin/advancedviewplugin.pro +++ b/plugins/advancedviewplugin/advancedviewplugin.pro @@ -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) diff --git a/plugins/copy_translations.pri b/plugins/copy_translations.pri deleted file mode 100644 index 966c686..0000000 --- a/plugins/copy_translations.pri +++ /dev/null @@ -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 diff --git a/plugins/devtoolsplugin/devtoolsplugin.pro b/plugins/devtoolsplugin/devtoolsplugin.pro index 17fc54a..83335cb 100644 --- a/plugins/devtoolsplugin/devtoolsplugin.pro +++ b/plugins/devtoolsplugin/devtoolsplugin.pro @@ -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) diff --git a/plugins/lunchmealplugin/lunchmealplugin.pro b/plugins/lunchmealplugin/lunchmealplugin.pro index 0e74977..daf797d 100644 --- a/plugins/lunchmealplugin/lunchmealplugin.pro +++ b/plugins/lunchmealplugin/lunchmealplugin.pro @@ -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) diff --git a/plugins/presenceplugin/presenceplugin.pro b/plugins/presenceplugin/presenceplugin.pro index 2411bac..c4b421b 100644 --- a/plugins/presenceplugin/presenceplugin.pro +++ b/plugins/presenceplugin/presenceplugin.pro @@ -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) diff --git a/plugins/profileplugin/profileplugin.pro b/plugins/profileplugin/profileplugin.pro index d299e48..42cd1c0 100644 --- a/plugins/profileplugin/profileplugin.pro +++ b/plugins/profileplugin/profileplugin.pro @@ -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) diff --git a/plugins/reportsplugin/reportsplugin.pro b/plugins/reportsplugin/reportsplugin.pro index 706fb62..002d60b 100644 --- a/plugins/reportsplugin/reportsplugin.pro +++ b/plugins/reportsplugin/reportsplugin.pro @@ -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) diff --git a/plugins/updaterplugin/updaterplugin.pro b/plugins/updaterplugin/updaterplugin.pro index 95c635b..ec3d037 100644 --- a/plugins/updaterplugin/updaterplugin.pro +++ b/plugins/updaterplugin/updaterplugin.pro @@ -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) diff --git a/plugins/weatherplugin/weatherplugin.pro b/plugins/weatherplugin/weatherplugin.pro index 275eeaa..02016bc 100644 --- a/plugins/weatherplugin/weatherplugin.pro +++ b/plugins/weatherplugin/weatherplugin.pro @@ -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) diff --git a/plugins/webradioplugin/webradioplugin.pro b/plugins/webradioplugin/webradioplugin.pro index 28eb042..1024a95 100644 --- a/plugins/webradioplugin/webradioplugin.pro +++ b/plugins/webradioplugin/webradioplugin.pro @@ -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) diff --git a/zeiterfassung/win32/Qt.conf b/win32/Qt.conf similarity index 100% rename from zeiterfassung/win32/Qt.conf rename to win32/Qt.conf diff --git a/zeiterfassung/installs.pri b/zeiterfassung/installs.pri index 6d9adc7..ec42827 100644 --- a/zeiterfassung/installs.pri +++ b/zeiterfassung/installs.pri @@ -1,34 +1,8 @@ -COMPILED_TRANSLATIONS += $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.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 - -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.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_compiled_translations -PRE_TARGETDEPS += compiler_copy_compiled_translations_make_all - 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 +50,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 +61,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 diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri index c8dd1f2..26f2133 100644 --- a/zeiterfassung/installs_unix.pri +++ b/zeiterfassung/installs_unix.pri @@ -1,8 +1,3 @@ -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.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_scripts -PRE_TARGETDEPS += compiler_copy_scripts_make_all +scriptsInstall.path = $${DESTDIR} +scriptsInstall.files = unix/zeiterfassung.sh +INSTALLS += scriptsInstall diff --git a/zeiterfassung/installs_win32.pri b/zeiterfassung/installs_win32.pri deleted file mode 100644 index 4609981..0000000 --- a/zeiterfassung/installs_win32.pri +++ /dev/null @@ -1,45 +0,0 @@ -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 \ - $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll - -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.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_libraries -PRE_TARGETDEPS += compiler_copy_libraries_make_all - -IMAGE_FORMATS += $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${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.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_image_formats -PRE_TARGETDEPS += compiler_copy_image_formats_make_all - -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.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy_platforms -PRE_TARGETDEPS += compiler_copy_platforms_make_all diff --git a/zeiterfassung/unix/start.sh b/zeiterfassung/unix/start.sh deleted file mode 100755 index b3c1ca6..0000000 --- a/zeiterfassung/unix/start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd "${0%/*}" -LD_LIBRARY_PATH=../lib ./zeiterfassung diff --git a/zeiterfassung/unix/zeiterfassung.sh b/zeiterfassung/unix/zeiterfassung.sh new file mode 100755 index 0000000..29ab530 --- /dev/null +++ b/zeiterfassung/unix/zeiterfassung.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd "${0%/*}" +LD_LIBRARY_PATH=. ./zeiterfassung diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index 82626d1..506e989 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -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,8 +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) -win32: include(installs_win32.pri) diff --git a/zeiterfassungcorelib/zeiterfassungcorelib.pro b/zeiterfassungcorelib/zeiterfassungcorelib.pro index 079d25e..8c0d06f 100644 --- a/zeiterfassungcorelib/zeiterfassungcorelib.pro +++ b/zeiterfassungcorelib/zeiterfassungcorelib.pro @@ -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) diff --git a/zeiterfassungguilib/zeiterfassungguilib.pro b/zeiterfassungguilib/zeiterfassungguilib.pro index 2936ed3..363bf9d 100644 --- a/zeiterfassungguilib/zeiterfassungguilib.pro +++ b/zeiterfassungguilib/zeiterfassungguilib.pro @@ -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)