diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-05 23:00:16 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-05 23:00:16 (GMT) |
| commit | 43e116ea63ffd96d945fbaabeafb2374e5f18e9e (patch) | |
| tree | 52de6bdb9812b6b98aef7092d1530ea3cb3fb867 /src/corelib | |
| parent | 9ef422955154199e6f2d5569cb4074a5967f53e9 (diff) | |
| parent | 74d8577f5b71a593a968d0723aaca19a5249b7d3 (diff) | |
| download | Qt-43e116ea63ffd96d945fbaabeafb2374e5f18e9e.zip Qt-43e116ea63ffd96d945fbaabeafb2374e5f18e9e.tar.gz Qt-43e116ea63ffd96d945fbaabeafb2374e5f18e9e.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/qtextcodec_symbian.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp index c8a7357..504a7c8 100644 --- a/src/corelib/codecs/qtextcodec_symbian.cpp +++ b/src/corelib/codecs/qtextcodec_symbian.cpp @@ -119,11 +119,13 @@ static const QSymbianCodecInitData codecsData[] = { { /*271082504*/ 271082504, 0, "portuguese_locking_gsm7ext\0" }, { /*271082505*/ 271082505, 0, "portuguese_locking_single\0" }, { /*271082506*/ 271082506, 0, "spanish_gsm7_single\0" }, + { /*271082762*/ 271082762, 0, "hkscs_2004\0" }, { /*271085624*/ 271085624, 114, "GB18030\0" }, { /*536929574*/ 536929574, 38, "EUC-KR\0" }, { /*536936703*/ 536936703, 0, "CP949\0" }, { /*536936705*/ 536936705, 37, "ISO-2022-KR\0csISO2022KR\0" }, - { /*536941517*/ 536941517, 36, "KS_C_5601-1987\0iso-ir-149\0KS_C_5601-1989\0KSC_5601\0Korean\0csKSC56011987\0" } + { /*536941517*/ 536941517, 36, "KS_C_5601-1987\0iso-ir-149\0KS_C_5601-1989\0KSC_5601\0Korean\0csKSC56011987\0" }, + { /*537124345*/ 537124345, 119, "KZ-1048\0" } }; |