summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-03 16:59:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-03 16:59:55 (GMT)
commit3143c71cf2df5b2834817dc23e41e3fc5360e5c3 (patch)
treef224adab753b872a451c5461907a1cd1631f75e9
parentc86b2ef30b43bfbe39d0ebba986d8d33743ae73f (diff)
parent1d71aaecf680b086ead2ef4791bdd433feac3f69 (diff)
downloadQt-3143c71cf2df5b2834817dc23e41e3fc5360e5c3.zip
Qt-3143c71cf2df5b2834817dc23e41e3fc5360e5c3.tar.gz
Qt-3143c71cf2df5b2834817dc23e41e3fc5360e5c3.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rename qt_iw.ts to qt_he.ts
-rw-r--r--translations/qt_he.ts (renamed from translations/qt_iw.ts)0
-rw-r--r--translations/translations.pri2
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 9c70557..57089ff 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 iw ja_JP pl pt ru sk sl sv uk zh_CN zh_TW
+QT_TS = ar cs da de es fr he 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 \