summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-11-30 15:54:16 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-11-30 14:24:51 +0000
commit39298a8142f140e23a38e2ed53274e7a3c3a93c7 (patch)
treeb4363dfe5ece8f5c274c74c4ef59a4a44a98f2dc
parente26dac76bc82ba7888726cc0b2eb5103b50ef17e (diff)
Fix path to Qt5Tool:lrelease for nativeeel_4.99.4eel/4.99.44.99.4
Makefile for dashboard generated by qmake looked at lrelease in the host environment, therefore dashboard's build should fail if 'lrelease' is not installed in the host. Fix project include file for dashboard becoming able to generate correct path for 'lrelease' from related path: lrelease to absolute path: <sysroot>/lrelease Change-Id: Ia46a50a6b67d96a3a7234c840ad22bce0b22959d Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> (cherry picked from commit 06ca4be06cc082c77565f1828fedce11e3510b6b)
-rw-r--r--app/translations.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/translations.pri b/app/translations.pri
index d5616ef..81bd94b 100644
--- a/app/translations.pri
+++ b/app/translations.pri
@@ -3,13 +3,13 @@ defineReplace(prependAll) {
return($$result)
}
-LRELEASE = lrelease
+qtPrepareTool(QMAKE_LRELEASE, lrelease)
TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/translations/$${TARGET}_,.ts)
qm.depends = $${TRANSLATIONS}
qm.input = TRANSLATIONS
qm.output = $$OUT_PWD/../package/root/translations/${QMAKE_FILE_BASE}.qm
-qm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+qm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
qm.name = LRELEASE ${QMAKE_FILE_IN}
qm.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += qm