diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 16:03:02 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 16:03:02 (GMT) |
| commit | b036e0c3b7c7094c666367000ca05047fc5d1003 (patch) | |
| tree | 98f56e4def11e11cc52d524cdf7dad4e23dc86e3 /translations | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775 (diff) | |
| download | Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.zip Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.tar.gz Qt-b036e0c3b7c7094c666367000ca05047fc5d1003.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
translations/translations.pri
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/qt_he.ts (renamed from translations/qt_iw.ts) | 0 | ||||
| -rw-r--r-- | translations/translations.pri | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/translations/qt_iw.ts b/translations/qt_he.ts index 72a6df9..72a6df9 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_he.ts diff --git a/translations/translations.pri b/translations/translations.pri index 34da6b1..3c4bdd1 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -17,7 +17,7 @@ LUPDATE += -locations relative -no-ui-lines ###### Qt Libraries -QT_TS = ar cs da de es fr hu iw ja_JP pl pt ru sk sl sv uk zh_CN zh_TW +QT_TS = ar cs da de es fr he hu 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 \ |