summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-08 16:02:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-10-08 16:02:01 (GMT)
commit3945fd75a93d790434b33c2d23add155893a82a4 (patch)
treee83166a337857381d1c152d0bb9c0f1c5d101efc /translations
parentf7e13aefc24b98299d8fd44cad60cc13b16e4114 (diff)
parentaa863c61ec5e68ff73c02e25a2954cdba9c2ef15 (diff)
downloadQt-3945fd75a93d790434b33c2d23add155893a82a4.zip
Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.gz
Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: src/gui/itemviews/qheaderview.cpp
Diffstat (limited to 'translations')
-rw-r--r--translations/translations.pri5
1 files changed, 1 insertions, 4 deletions
diff --git a/translations/translations.pri b/translations/translations.pri
index b7924cd..c77876a 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)