diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-15 02:52:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-15 02:52:36 (GMT) |
| commit | 8ae389ef33ed61ff2042cbf09869f442be2c3352 (patch) | |
| tree | 92e782d3693a75bc4a6da012929f7fd11d828e5b | |
| parent | 8f3277d808e2f77661df0e28dfb8f4c6025258cb (diff) | |
| parent | 07db60c5ab4217acc7dfbd50416d9bbaf8be70be (diff) | |
| download | Qt-8ae389ef33ed61ff2042cbf09869f442be2c3352.zip Qt-8ae389ef33ed61ff2042cbf09869f442be2c3352.tar.gz Qt-8ae389ef33ed61ff2042cbf09869f442be2c3352.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
fix qm generation under windows
| -rw-r--r-- | translations/translations.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index ef09dc3..05dd968 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -14,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 = @echo lrelease ${QMAKE_FILE_IN} && $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm |