summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-16 13:02:21 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-16 13:02:58 (GMT)
commitcaea6ba8c063e6eaf997d00b7c0e2a30bb712c1e (patch)
treebdb1a376ee8403675f39b3322e963237d59eaafb
parent6809bd020e3307324e136707f32f6f17f77b9591 (diff)
downloadQt-caea6ba8c063e6eaf997d00b7c0e2a30bb712c1e.zip
Qt-caea6ba8c063e6eaf997d00b7c0e2a30bb712c1e.tar.gz
Qt-caea6ba8c063e6eaf997d00b7c0e2a30bb712c1e.tar.bz2
fix mingw build when sh is in $PATH
-rw-r--r--translations/translations.pri2
-rw-r--r--translations/translations.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/translations/translations.pri b/translations/translations.pri
index c423809..5eb7328 100644
--- a/translations/translations.pri
+++ b/translations/translations.pri
@@ -9,7 +9,7 @@ defineReplace(prependAll) {
}
LUPDATE = $$QT_BUILD_TREE/bin/lupdate -locations relative -no-ui-lines
-win32:LUPDATE ~= s|/|\\|g
+win32:isEmpty(QMAKE_SH):LUPDATE ~= s|/|\\|g
###### Qt Libraries
diff --git a/translations/translations.pro b/translations/translations.pro
index 22f0ace..60f84e6 100644
--- a/translations/translations.pro
+++ b/translations/translations.pro
@@ -1,7 +1,7 @@
TRANSLATIONS = $$files(*.ts)
LRELEASE = $$QT_BUILD_TREE/bin/lrelease
-win32:LRELEASE ~= s|/|\\|g
+win32:isEmpty(QMAKE_SH):LRELEASE ~= s|/|\\|g
contains(TEMPLATE_PREFIX, vc):vcproj = 1