diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-05 16:06:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-05 16:06:20 (GMT) |
| commit | 013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f (patch) | |
| tree | a010c01402ae8c9284e483da767a454489efb479 /src/corelib/codecs | |
| parent | c018f01b8a97e9ae3dee12777fd1bde4c51f231e (diff) | |
| parent | 6adc6f500e1d2f65a493a76baf35c5f11180edeb (diff) | |
| download | Qt-013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f.zip Qt-013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f.tar.gz Qt-013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/corelib/codecs')
| -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" } }; |