From faa7778685875b4cccf2e756a9aaa60b4254ff5a Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 20:44:26 +0100
Subject: [PATCH 01/10] Added caching of qt5 in .travis.yml

---
 .travis.yml | 17 ++++-------------
 make_qt.sh  |  8 ++++++++
 2 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 make_qt.sh

diff --git a/.travis.yml b/.travis.yml
index 63aeed6..f0d5e8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,12 @@ dist: trusty
 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
-  - pushd qt5
-  - perl init-repository --module-subset=qtbase,qtimageformats
-  - ./configure -static -opensource -nomake examples -nomake tests -confirm-license
-  - make -j2
-  - sudo make install
-  - popd
-  - fi
+  - if [ ! -d qt5 ] ; then source make_qt.sh ; fi
 
 script:
   - which qmake
diff --git a/make_qt.sh b/make_qt.sh
new file mode 100644
index 0000000..9769b82
--- /dev/null
+++ b/make_qt.sh
@@ -0,0 +1,8 @@
+#!/bin/bash0
+git clone --branch=5.10 git://code.qt.io/qt/qt5.git
+pushd qt5
+perl init-repository --module-subset=qtbase,qtimageformats
+./configure -static -opensource -nomake examples -nomake tests -confirm-license
+make -j2
+sudo make install
+popd
\ No newline at end of file
-- 
2.50.1


From e04ef5cf1a018c8c655482f4c587e2835afefc1d Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 20:52:11 +0100
Subject: [PATCH 02/10] Removed caching in .travis.yml to avoid error

---
 .travis.yml | 22 ++++++++++------------
 make_qt.sh  |  8 --------
 2 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 make_qt.sh

diff --git a/.travis.yml b/.travis.yml
index f0d5e8c..ae9175b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,20 @@
 language: cpp
-os:
-  - linux
+os: linux
 dist: trusty
-compiler:
-  - gcc
-
-cache:
-  directories:
-    - qt5
+compiler: gcc
 
 before_script:
-  - if [ ! -d qt5 ] ; then source make_qt.sh ; fi
+  - git clone --branch=5.10 git://code.qt.io/qt/qt5.git
+  - pushd qt5
+  - perl init-repository --module-subset=qtbase,qtimageformats
+  - ./configure -opensource -nomake examples -nomake tests -confirm-license
+  - make -j2
+  - sudo make install
+  - popd
 
 script:
-  - which qmake
-  - which lrelease
   - mkdir -p build
   - pushd build
-  - qmake .. -config release
+  - ../qt5/qtbase/bin/qmake .. -config release
   - make -j2
   - popd
\ No newline at end of file
diff --git a/make_qt.sh b/make_qt.sh
deleted file mode 100644
index 9769b82..0000000
--- a/make_qt.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash0
-git clone --branch=5.10 git://code.qt.io/qt/qt5.git
-pushd qt5
-perl init-repository --module-subset=qtbase,qtimageformats
-./configure -static -opensource -nomake examples -nomake tests -confirm-license
-make -j2
-sudo make install
-popd
\ No newline at end of file
-- 
2.50.1


From aca9664316b0524faca98521e59688126ad73415 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 21:30:19 +0100
Subject: [PATCH 03/10] Added cache again

---
 .travis.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae9175b..b4a4c17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,16 @@ os: linux
 dist: trusty
 compiler: gcc
 
+cache:
+  directories:
+    - qt5
+
 before_script:
-  - 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 -opensource -nomake examples -nomake tests -confirm-license
+  - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats ; fi
+  - if [ ! -f config.summaryr ] ; then ./configure -opensource -nomake examples -nomake tests -confirm-license ; fi
   - make -j2
   - sudo make install
   - popd
-- 
2.50.1


From 4c7510184540380b071ad567c1d46357b2967e30 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 21:31:30 +0100
Subject: [PATCH 04/10] Fixed typo in .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b4a4c17..0dd59f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_script:
   - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.10 git://code.qt.io/qt/qt5.git ; fi
   - pushd qt5
   - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats ; fi
-  - if [ ! -f config.summaryr ] ; then ./configure -opensource -nomake examples -nomake tests -confirm-license ; fi
+  - if [ ! -f config.summary ] ; then ./configure -opensource -confirm-license -nomake examples -nomake tests ; fi
   - make -j2
   - sudo make install
   - popd
-- 
2.50.1


From 6f70e8894e19179cf88fbe279395224c79301139 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 21:39:04 +0100
Subject: [PATCH 05/10] Added qttools to .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0dd59f3..3f7d43a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_script:
   - 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
-  - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats ; fi
+  - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qttools ; fi
   - if [ ! -f config.summary ] ; then ./configure -opensource -confirm-license -nomake examples -nomake tests ; fi
   - make -j2
   - sudo make install
-- 
2.50.1


From e72c389de54010302094250539fce3e404cf0ce2 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 24 Dec 2017 22:29:53 +0100
Subject: [PATCH 06/10] Removed make output to avoid build abort

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3f7d43a..834d93e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_script:
   - pushd qt5
   - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qttools ; fi
   - if [ ! -f config.summary ] ; then ./configure -opensource -confirm-license -nomake examples -nomake tests ; fi
-  - make -j2
+  - make -j2 > /dev/null
   - sudo make install
   - popd
 
-- 
2.50.1


From f2bb3f393f7a028c503acb309d3bd456a13a51df Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Mon, 25 Dec 2017 10:13:32 +0100
Subject: [PATCH 07/10] Added prefix to qt configure

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 834d93e..c06434f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: cpp
 os: linux
+sudo: false
 dist: trusty
 compiler: gcc
 
@@ -12,14 +13,13 @@ before_script:
   - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.10 git://code.qt.io/qt/qt5.git ; fi
   - pushd qt5
   - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qttools ; fi
-  - if [ ! -f config.summary ] ; then ./configure -opensource -confirm-license -nomake examples -nomake tests ; fi
-  - make -j2 > /dev/null
-  - sudo make install
+  - 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
 
 script:
   - mkdir -p build
   - pushd build
-  - ../qt5/qtbase/bin/qmake .. -config release
+  - ../qt5/build/bin/qmake .. -config release
   - make -j2
   - popd
\ No newline at end of file
-- 
2.50.1


From 25814dacbb3976dfa5c3f9fed8e722360b14b072 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Mon, 25 Dec 2017 10:50:40 +0100
Subject: [PATCH 08/10] Added qtmultimedia to qt build

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c06434f..0d8c2a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_script:
   - 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
-  - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qttools ; fi
+  - 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
-- 
2.50.1


From c8671b54171a5024e71247872d49d0f8e8848746 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Tue, 26 Dec 2017 15:55:41 +0100
Subject: [PATCH 09/10] Translations are compiled directly into bin folder and
 fixed #24

---
 lrelease.pri                                    |  4 ++--
 .../advancedviewplugin/advancedviewplugin.pro   | 15 ++++++---------
 plugins/copy_translations.pri                   |  6 ------
 plugins/devtoolsplugin/devtoolsplugin.pro       | 15 ++++++---------
 plugins/lunchmealplugin/lunchmealplugin.pro     | 15 ++++++---------
 plugins/presenceplugin/presenceplugin.pro       | 15 ++++++---------
 plugins/profileplugin/profileplugin.pro         | 15 ++++++---------
 plugins/reportsplugin/reportsplugin.pro         | 15 ++++++---------
 plugins/updaterplugin/updaterplugin.pro         | 15 ++++++---------
 plugins/weatherplugin/weatherplugin.pro         | 15 ++++++---------
 plugins/webradioplugin/webradioplugin.pro       | 15 ++++++---------
 zeiterfassung/installs.pri                      | 16 +++++-----------
 zeiterfassung/installs_unix.pri                 |  2 +-
 zeiterfassung/installs_win32.pri                |  8 +++-----
 zeiterfassung/unix/start.sh                     |  2 +-
 zeiterfassung/zeiterfassung.pro                 | 12 +++++++-----
 zeiterfassungcorelib/zeiterfassungcorelib.pro   | 11 ++++-------
 zeiterfassungguilib/zeiterfassungguilib.pro     | 17 +++++++----------
 18 files changed, 84 insertions(+), 129 deletions(-)
 delete mode 100644 plugins/copy_translations.pri

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/installs.pri b/zeiterfassung/installs.pri
index 6d9adc7..cf6320d 100644
--- a/zeiterfassung/installs.pri
+++ b/zeiterfassung/installs.pri
@@ -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
diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri
index c8dd1f2..6a4db79 100644
--- a/zeiterfassung/installs_unix.pri
+++ b/zeiterfassung/installs_unix.pri
@@ -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
diff --git a/zeiterfassung/installs_win32.pri b/zeiterfassung/installs_win32.pri
index 4609981..00fd871 100644
--- a/zeiterfassung/installs_win32.pri
+++ b/zeiterfassung/installs_win32.pri
@@ -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
diff --git a/zeiterfassung/unix/start.sh b/zeiterfassung/unix/start.sh
index b3c1ca6..29ab530 100755
--- a/zeiterfassung/unix/start.sh
+++ b/zeiterfassung/unix/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 cd "${0%/*}"
-LD_LIBRARY_PATH=../lib ./zeiterfassung
+LD_LIBRARY_PATH=. ./zeiterfassung
diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro
index 82626d1..1b9a5ae 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,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)
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)
-- 
2.50.1


From d5378377c55f96d55def53dda66c5624c5ecc2e4 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Tue, 26 Dec 2017 16:16:28 +0100
Subject: [PATCH 10/10] Moved copying of qt translations into separate install
 step

---
 zeiterfassung.pro => QtZeiterfassung.pro      |  3 ++
 installs.pri                                  | 14 ++++++
 installs_win32.pri                            | 28 ++++++++++++
 {zeiterfassung/win32 => win32}/Qt.conf        |  0
 zeiterfassung/installs.pri                    | 20 ---------
 zeiterfassung/installs_unix.pri               | 11 ++---
 zeiterfassung/installs_win32.pri              | 43 -------------------
 .../unix/{start.sh => zeiterfassung.sh}       |  0
 zeiterfassung/zeiterfassung.pro               |  1 -
 9 files changed, 48 insertions(+), 72 deletions(-)
 rename zeiterfassung.pro => QtZeiterfassung.pro (83%)
 create mode 100644 installs.pri
 create mode 100644 installs_win32.pri
 rename {zeiterfassung/win32 => win32}/Qt.conf (100%)
 delete mode 100644 zeiterfassung/installs_win32.pri
 rename zeiterfassung/unix/{start.sh => zeiterfassung.sh} (100%)

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/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 cf6320d..ec42827 100644
--- a/zeiterfassung/installs.pri
+++ b/zeiterfassung/installs.pri
@@ -1,23 +1,3 @@
-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
-
-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
diff --git a/zeiterfassung/installs_unix.pri b/zeiterfassung/installs_unix.pri
index 6a4db79..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 00fd871..0000000
--- a/zeiterfassung/installs_win32.pri
+++ /dev/null
@@ -1,43 +0,0 @@
-CONFIG(debug, release|debug): DEBUG_SIGN = d
-
-LIBRARIES += 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
-
-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/zeiterfassung.sh
similarity index 100%
rename from zeiterfassung/unix/start.sh
rename to zeiterfassung/unix/zeiterfassung.sh
diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro
index 1b9a5ae..506e989 100755
--- a/zeiterfassung/zeiterfassung.pro
+++ b/zeiterfassung/zeiterfassung.pro
@@ -36,4 +36,3 @@ include($${PROJECT_ROOT}/lrelease.pri)
 
 include(installs.pri)
 unix: include(installs_unix.pri)
-win32: include(installs_win32.pri)
-- 
2.50.1