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 /src/corelib/codecs/qtextcodec.cpp | |
| 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>
Diffstat (limited to 'src/corelib/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 7 |
1 files changed, 3 insertions, 4 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} |