summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-03 06:02:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-03 06:02:23 (GMT)
commita77ea15b08380d3af877c2ee2e28e4d80717177e (patch)
tree4afe0e16c8a4ee743599d41cb5b6325c9cb020c3 /src/corelib
parent05737f5cc5811c80b5bdb99b411f50393ce7b612 (diff)
parent61919115f0645c30514bd88109335b8f4637d192 (diff)
downloadQt-a77ea15b08380d3af877c2ee2e28e4d80717177e.zip
Qt-a77ea15b08380d3af877c2ee2e28e4d80717177e.tar.gz
Qt-a77ea15b08380d3af877c2ee2e28e4d80717177e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: symbian - add support for ELangKazakh and ELangEnglish_India
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qlocale_symbian.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index 2742c45..367017b 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -135,6 +135,7 @@ static const symbianToISO symbian_to_iso_list[] = {
{ ELangHebrew, "he_IL" }, // 57
{ ELangHindi, "hi_IN" }, // 58
{ ELangIndonesian, "id_ID" }, // 59
+ { ELangKazakh, "kk_KZ" }, // 63
{ ELangKorean, "ko_KO" }, // 65
{ ELangLatvian, "lv_LV" }, // 67
{ ELangLithuanian, "lt_LT" }, // 68
@@ -159,6 +160,7 @@ static const symbianToISO symbian_to_iso_list[] = {
{ ELangEnglish_Prc, "en_CN" }, // 159 ### Not supported by CLDR
{ ELangEnglish_Japan, "en_JP"}, // 160 ### Not supported by CLDR
{ ELangEnglish_Thailand, "en_TH" }, // 161 ### Not supported by CLDR
+ { 230/*ELangEnglish_India*/,"en_IN" }, // 230 - appeared in Symbian^3
{ ELangMalay_Apac, "ms" }, // 326
#endif
{ 327/*ELangIndonesian_Apac*/,"id_ID" } // 327 - appeared in Symbian^3