diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
| commit | e5bcddb6fecc1fb55f18f734601a3e928dc7510a (patch) | |
| tree | 4c6fd15be926b48ca7e962c51024a1bea9bae649 /translations | |
| parent | 468bd5ac176c42af310d439810bbd3bb561f5a1b (diff) | |
| parent | 3945fd75a93d790434b33c2d23add155893a82a4 (diff) | |
| download | Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.zip Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.gz Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.bz2 | |
Merge branch '4.6'
Conflicts:
tools/assistant/translations/translations_adp.pro
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pri | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index bc991df..aa5430f 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -9,12 +9,9 @@ defineReplace(prependAll) { } defineReplace(fixPath) { -WIN { - return ($$replace($$1, /, \)) -} ELSE { + win32:1 ~= s|/|\\| return ($$1) } -} LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate) -locations relative -no-ui-lines LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease) |