diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
| commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
| tree | 8df5223ac114d758c2112a8fc787992175556418 /src/corelib/codecs/qtextcodec.cpp | |
| parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
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} |