diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 18:02:01 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 18:02:01 +0200 |
| commit | 3945fd75a93d790434b33c2d23add155893a82a4 (patch) | |
| tree | e83166a337857381d1c152d0bb9c0f1c5d101efc /translations | |
| parent | f7e13aefc24b98299d8fd44cad60cc13b16e4114 (diff) | |
| parent | aa863c61ec5e68ff73c02e25a2954cdba9c2ef15 (diff) | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/itemviews/qheaderview.cpp
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 b7924cdd22..c77876adb8 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) |