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

Moved copying of qt translations into separate install step

Browse Source
This commit is contained in:
0xFEEDC0DE64
2017-12-26 16:16:28 +01:00
parent c8671b5417
commit d5378377c5
9 changed files with 48 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zeiterfassung.pro → QtZeiterfassung.pro
View File

@@ -8,3 +8,6 @@ SUBDIRS += plugins \
plugins.depends += zeiterfassungguilib
zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib
zeiterfassungguilib.depends += zeiterfassungcorelib
include(installs.pri)
win32: include(installs_win32.pri)

14
installs.pri Normal file
View File

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

28
installs_win32.pri Normal file
View File

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

0
zeiterfassung/win32/Qt.conf → win32/Qt.conf
View File

20
zeiterfassung/installs.pri
View File

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

11
zeiterfassung/installs_unix.pri
View File

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

43
zeiterfassung/installs_win32.pri
View File

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

0
zeiterfassung/unix/start.sh → zeiterfassung/unix/zeiterfassung.sh
View File

1
zeiterfassung/zeiterfassung.pro
View File

@@ -36,4 +36,3 @@ include($${PROJECT_ROOT}/lrelease.pri)
include(installs.pri)
unix: include(installs_unix.pri)
win32: include(installs_win32.pri)