summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-06-16 10:44:03 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-06-16 10:44:03 (GMT)
commit33617f8c945c764034ed8d27133b443bc6799a61 (patch)
tree95235119f20dbddae74a994f9604a41e1bf0cf52
parentab0cd5bbbb956504352f10aa12e5ee829ab0264e (diff)
downloadQt-33617f8c945c764034ed8d27133b443bc6799a61.zip
Qt-33617f8c945c764034ed8d27133b443bc6799a61.tar.gz
Qt-33617f8c945c764034ed8d27133b443bc6799a61.tar.bz2
Revert "make qm target work when the freshly built Qt is not in the library"
This reverts commit bcbb66df3d517cfb0bac63b041f666ee9db0e42d.
-rw-r--r--translations/translations.pro13
1 files changed, 2 insertions, 11 deletions
diff --git a/translations/translations.pro b/translations/translations.pro
index 6f14108..d1962fe 100644
--- a/translations/translations.pro
+++ b/translations/translations.pro
@@ -1,16 +1,7 @@
TRANSLATIONS = $$files(*.ts)
LRELEASE = $$QT_BUILD_TREE/bin/lrelease
-win32 {
- LRELEASE ~= s|/|\|g
-} else:!static {
- path = $$QT_BUILD_TREE/lib
- !macx:var = LD_LIBRARY_PATH
- else:qt_no_framework:var = DYLD_LIBRARY_PATH
- else:var = DYLD_FRAMEWORK_PATH
-
- LRELEASE = test -z \"\$\$$$var\" && $$var=$$path || $$var=$$path:\$\$$$var; export $$var; $$LRELEASE
-}
+win32:LRELEASE ~= s|/|\|g
contains(TEMPLATE_PREFIX, vc):vcproj = 1
@@ -23,7 +14,7 @@ LIBS =
updateqm.input = TRANSLATIONS
updateqm.output = ${QMAKE_FILE_BASE}.qm
isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
-updateqm.commands = @echo lrelease ${QMAKE_FILE_IN}; $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
updateqm.name = LRELEASE ${QMAKE_FILE_IN}
updateqm.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += updateqm