diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-05-19 02:29:09 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-05-19 02:29:09 (GMT) |
| commit | 93c1117b7c9d3a0142dc3d48223d27883b61cbef (patch) | |
| tree | 2ff1d3132cc5304cc9eaa6eeea0cb9c16122fe47 /translations | |
| parent | 787e9d163dea6b9423c21fbcbe4a7b82f06cb4b3 (diff) | |
| parent | dcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff) | |
| download | Qt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.zip Qt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.tar.gz Qt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pri | 6 | ||||
| -rw-r--r-- | translations/translations.pro | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index 57089ff..30aa996 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -8,11 +8,7 @@ defineReplace(prependAll) { return ($$result) } -LUPDATE = $$QT_BUILD_TREE/bin/lupdate -win32 { - LUPDATE ~= s,/,$$QMAKE_DIR_SEP, - LUPDATE = $${LUPDATE}.exe -} +qtPrepareTool(LUPDATE, lupdate) LUPDATE += -locations relative -no-ui-lines ###### Qt Libraries diff --git a/translations/translations.pro b/translations/translations.pro index 8f37451..c6d46a3 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,10 +1,6 @@ TRANSLATIONS = $$files(*.ts) -LRELEASE = $$QT_BUILD_TREE/bin/lrelease -win32 { - LRELEASE ~= s,/,$$QMAKE_DIR_SEP, - LRELEASE = $${LRELEASE}.exe -} +qtPrepareTool(LRELEASE, lrelease) contains(TEMPLATE_PREFIX, vc):vcproj = 1 |