diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
| commit | 27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d (patch) | |
| tree | 4be868ec6a0a425044bee84f269cfee3bad7c0e6 /translations | |
| parent | 50afd26a657da319bd6e3cff09ac6c8dd44405bf (diff) | |
| parent | 61f2b450560887651b3350e63bdd75609e3b6752 (diff) | |
| download | Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.zip Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.gz Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
src/corelib/animation/qabstractanimation.cpp
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pri | 2 | ||||
| -rw-r--r-- | translations/translations.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index 5eb7328..7a24a4f 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -9,7 +9,7 @@ defineReplace(prependAll) { } LUPDATE = $$QT_BUILD_TREE/bin/lupdate -locations relative -no-ui-lines -win32:isEmpty(QMAKE_SH):LUPDATE ~= s|/|\\|g +LUPDATE ~= s,/,$$QMAKE_DIR_SEP, ###### Qt Libraries diff --git a/translations/translations.pro b/translations/translations.pro index 60f84e6..ef09dc3 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,7 +1,7 @@ TRANSLATIONS = $$files(*.ts) LRELEASE = $$QT_BUILD_TREE/bin/lrelease -win32:isEmpty(QMAKE_SH):LRELEASE ~= s|/|\\|g +LRELEASE ~= s,/,$$QMAKE_DIR_SEP, contains(TEMPLATE_PREFIX, vc):vcproj = 1 |