From ef21b304547a20569e95df782e29759b5f9ee44a Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 30 May 2015 19:01:33 +0200 Subject: [PATCH] Make lrelease detection work on Windows. Windows doesn't have which, so building natively on Windows didn't create translations anymore. Use a which-less approach instead. Change-Id: I7b4c40b26d68da54277a148e8e2d76ac81061c8b --- rbutil/rbutilqt/rbutilqt.pro | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index d4cf5042bb..71ab77ac62 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -105,14 +105,17 @@ tags.depends = $(SOURCES) QMAKE_EXTRA_TARGETS += tags # add a custom rule for making the translations -LRELEASE = $$system(which $$[QT_INSTALL_BINS]/lrelease) +LRELEASE = $$[QT_INSTALL_BINS]/lrelease +win32:!cross { + LRELEASE = $$[QT_INSTALL_BINS]/lrelease.exe +} lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_ QMAKE_EXTRA_TARGETS += lrelease -!isEmpty(LRELEASE) { +exists(LRELEASE) { message("using lrelease at $$LRELEASE") PRE_TARGETDEPS += lrelease } -isEmpty(LRELEASE) { +!exists(LRELEASE) { warning("could not find lrelease. Skipping translations.") }