diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
commit | 4d33c51bf00be826b8036f58cd9aea0c1f44f8ce (patch) | |
tree | 99339183e160058b996580157d8ed89bd6809562 /translations/translations.pri | |
parent | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (diff) | |
parent | b0e6c5ca48c76fb17dca986e9e07adebde390e29 (diff) | |
download | Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.zip Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.gz Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.bz2 |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
tools/assistant/translations/translations_adp.pro
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
translations/assistant_adp_de.ts
Diffstat (limited to 'translations/translations.pri')
-rw-r--r-- | translations/translations.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index a21e86f..bc991df 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -21,7 +21,7 @@ LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease) ###### Qt Libraries -QT_TS = de fr zh_CN untranslated ar es iw ja_JP pl pt ru sk sl sv uk zh_TW da +QT_TS = ar da de es fr iw ja_JP pl pt ru sk sl sv uk zh_CN zh_TW ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ -I../include -I../include/Qt \ @@ -41,10 +41,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ svg \ xml \ xmlpatterns \ - -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)) + -ts $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts)) ts-qt.depends = sub-tools -qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts) +qm-qt.commands = $$LRELEASE $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts) qm-qt.depends = sub-tools ###### Designer |