Release v1.4 #11

Merged
0xFEEDC0DE64 merged 16 commits from devel into master 2017-12-17 17:14:39 +01:00
162 changed files with 1347 additions and 873 deletions
Showing only changes of commit 551fce4496 - Show all commits

11
lrelease.pri Normal file
View File

@@ -0,0 +1,11 @@
isEmpty(QMAKE_LRELEASE) {
win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
}
lrelease.input = TRANSLATIONS
lrelease.output = $${OUT_PWD}/translations/${QMAKE_FILE_BASE}.qm
lrelease.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm $${OUT_PWD}/translations/${QMAKE_FILE_BASE}.qm
lrelease.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += lrelease
PRE_TARGETDEPS += compiler_lrelease_make_all

View File

@@ -21,13 +21,17 @@ SOURCES += main.cpp
HEADERS += HEADERS +=
FORMS += FORMS += strips/bookingstartstrip.ui \
strips/bookingendstrip.ui \
strips/timeassignmentstrip.ui
RESOURCES += RESOURCES +=
TRANSLATIONS += translations/zeiterfassung_en.ts \ TRANSLATIONS += translations/zeiterfassung_en.ts \
translations/zeiterfassung_de.ts translations/zeiterfassung_de.ts
include(../lrelease.pri)
include(installs.pri) include(installs.pri)
unix: include(installs_unix.pri) unix: include(installs_unix.pri)
win32: include(installs_win32.pri) win32: include(installs_win32.pri)

View File

@@ -90,6 +90,8 @@ RESOURCES += resources.qrc
TRANSLATIONS += translations/zeiterfassunglib_en.ts \ TRANSLATIONS += translations/zeiterfassunglib_en.ts \
translations/zeiterfassunglib_de.ts translations/zeiterfassunglib_de.ts
include(../lrelease.pri)
# unix { # unix {
# target.path = /usr/lib # target.path = /usr/lib
# INSTALLS += target # INSTALLS += target