diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2014-10-22 16:35:43 +0400 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2014-10-24 22:23:58 +0200 |
commit | 3903aee91bb4bca618593cf4c856edc0be2a17d8 (patch) | |
tree | 605a783f466fbc842c7c71ba06d4e5c0439fa3a9 | |
parent | 7645b64d896330885a2afcbb996b677730151570 (diff) |
Fix doc about the list of supported codecs
Replace "Apple Roman" by "Macintosh" which is registered by IANA:
http://tools.ietf.org/html/rfc1345.
Replace unsupported "GB18030-0" by "GB18030".
Remove "JIS X 0201" and "JIS X 0208" as they are supported as parts of
other Japanese encodings but not directly.
Add "HP-ROMAN8" which is supported by both Qt and ICU.
Also clean the codecs test.
Change-Id: Iaf8e8ff1900d3f92ea0e0df75c60fe1534de23ac
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 7 | ||||
-rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 519570c499..9d13e1b892 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -346,13 +346,13 @@ QTextCodec::ConverterState::~ConverterState() The supported encodings are: \list - \li Apple Roman \li \l{Big5 Text Codec}{Big5} \li \l{Big5-HKSCS Text Codec}{Big5-HKSCS} \li CP949 \li \l{EUC-JP Text Codec}{EUC-JP} \li \l{EUC-KR Text Codec}{EUC-KR} - \li \l{GBK Text Codec}{GB18030-0} + \li \l{GBK Text Codec}{GB18030} + \li HP-ROMAN8 \li IBM 850 \li IBM 866 \li IBM 874 @@ -360,10 +360,9 @@ QTextCodec::ConverterState::~ConverterState() \li ISO 8859-1 to 10 \li ISO 8859-13 to 16 \li Iscii-Bng, Dev, Gjr, Knd, Mlm, Ori, Pnj, Tlg, and Tml - \li JIS X 0201 - \li JIS X 0208 \li KOI8-R \li KOI8-U + \li Macintosh \li \l{Shift-JIS Text Codec}{Shift-JIS} \li TIS-620 \li \l{TSCII Text Codec}{TSCII} diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 24487aa7cc..4e3d5c64bc 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -197,10 +197,8 @@ void tst_QTextCodec::fromUnicode_data() QTest::newRow("windows-1258") << "windows-1258" << true; QTest::newRow("Apple Roman") << "Apple Roman" << true; - QTest::newRow("macintosh") << "macintosh" << true; //QTest::newRow("WINSAMI2") << "WINSAMI2" << true; QTest::newRow("TIS-620") << "TIS-620" << true; -// QTest::newRow("hp-roman8") << "hp-roman8" << true; QTest::newRow("SJIS") << "SJIS" << false; // all codecs from documentation @@ -210,20 +208,17 @@ void tst_QTextCodec::fromUnicode_data() QTest::newRow("windows-949") << "windows-949" << false; QTest::newRow("EUC-JP") << "EUC-JP" << false; QTest::newRow("EUC-KR") << "EUC-KR" << false; - //QTest::newRow("GB18030-0") << "GB18030-0" << false; // only GB18030 works QTest::newRow("GB18030") << "GB18030" << false; + QTest::newRow("HP-ROMAN8") << "HP-ROMAN8" << false; QTest::newRow("IBM 850") << "IBM 850" << false; QTest::newRow("IBM 866") << "IBM 866" << false; QTest::newRow("IBM 874") << "IBM 874" << false; QTest::newRow("ISO 2022-JP") << "ISO 2022-JP" << false; //ISO 8859-1 to 10 and ISO 8859-13 to 16 tested previously // Iscii-Bng, Dev, Gjr, Knd, Mlm, Ori, Pnj, Tlg, and Tml tested in Iscii test - //QTest::newRow("JIS X 0201") << "JIS X 0201" << false; // actually not there - //QTest::newRow("JIS X 0208") << "JIS X 0208" << false; // actually not there QTest::newRow("KOI8-R") << "KOI8-R" << false; QTest::newRow("KOI8-U") << "KOI8-U" << false; - //QTest::newRow("MuleLao-1") << "MuleLao-1" << false; //only on x11 - QTest::newRow("ROMAN8") << "ROMAN8" << false; + QTest::newRow("Macintosh") << "Macintosh" << true; QTest::newRow("Shift-JIS") << "Shift-JIS" << false; QTest::newRow("TIS-620") << "TIS-620" << false; QTest::newRow("TSCII") << "TSCII" << false; |