diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2014-10-20 16:31:34 +0400 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2014-10-24 22:23:50 +0200 |
| commit | 7645b64d896330885a2afcbb996b677730151570 (patch) | |
| tree | 00de24c0a00f2fceba8887e469f693ceb4af5698 | |
| parent | 6841dd6eccda88f08ad4c424fc9d5f9e400aaf43 (diff) | |
Add support for "Apple Roman" encoding
Substitute this encoding by "macintosh" when Qt is built with ICU.
It is for compatibility with Qt 4.x.
Change-Id: I70c51cba7d473ac81e25862736cb71a2f6894055
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index 103bf0573f..a549430649 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -445,6 +445,8 @@ QTextCodec *QIcuCodec::codecForNameUnlocked(const char *name) // backwards compatibility with Qt 4.x if (!qstrcmp(name, "CP949")) name = "windows-949"; + else if (!qstrcmp(name, "Apple Roman")) + name = "macintosh"; // these are broken data in ICU 4.4, and can't be resolved even though they are aliases to tis-620 if (!qstrcmp(name, "windows-874-2000") || !qstrcmp(name, "windows-874") diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 7c154575d0..24487aa7cc 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -196,6 +196,7 @@ void tst_QTextCodec::fromUnicode_data() QTest::newRow("windows-1257") << "windows-1257" << true; 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; |