diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-19 09:43:43 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-19 09:46:47 (GMT) |
| commit | 7d8c3cb2e531ce6df8d14096b0b3d31f517e767a (patch) | |
| tree | 0fa0ae70a65d7fb98efa12633c511886621a77db | |
| parent | 7ead8996874ab5504dcd24e9fbe1b55557a85233 (diff) | |
| download | Qt-7d8c3cb2e531ce6df8d14096b0b3d31f517e767a.zip Qt-7d8c3cb2e531ce6df8d14096b0b3d31f517e767a.tar.gz Qt-7d8c3cb2e531ce6df8d14096b0b3d31f517e767a.tar.bz2 | |
another attempt at fixing the translations build
make qmake generate proper dependencies on lrelease in vcproj/sln files
| -rw-r--r-- | translations/translations.pri | 8 | ||||
| -rw-r--r-- | translations/translations.pro | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index 7a24a4f..8896654 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -8,8 +8,12 @@ defineReplace(prependAll) { return ($$result) } -LUPDATE = $$QT_BUILD_TREE/bin/lupdate -locations relative -no-ui-lines -LUPDATE ~= s,/,$$QMAKE_DIR_SEP, +LUPDATE = $$QT_BUILD_TREE/bin/lupdate +win32 { + LUPDATE ~= s,/,$$QMAKE_DIR_SEP, + LUPDATE = $${LUPDATE}.exe +} +LUPDATE += -locations relative -no-ui-lines ###### Qt Libraries diff --git a/translations/translations.pro b/translations/translations.pro index 05dd968..f1b9c99 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,7 +1,10 @@ TRANSLATIONS = $$files(*.ts) LRELEASE = $$QT_BUILD_TREE/bin/lrelease -LRELEASE ~= s,/,$$QMAKE_DIR_SEP, +win32 { + LRELEASE ~= s,/,$$QMAKE_DIR_SEP, + LRELEASE = $${LRELEASE}.exe +} contains(TEMPLATE_PREFIX, vc):vcproj = 1 @@ -14,7 +17,8 @@ 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} +silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm |