diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-04-24 08:23:13 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-04-24 10:42:40 (GMT) |
| commit | 294f32f41da900ad3ae70e1546ea0057f8864d95 (patch) | |
| tree | ce0155aff9e81cf518b5f6560b3a4d9716b4aa38 | |
| parent | e09144d9ae2fbebaa5c6a2eeb7975a3a75ddbf0b (diff) | |
| download | Qt-294f32f41da900ad3ae70e1546ea0057f8864d95.zip Qt-294f32f41da900ad3ae70e1546ea0057f8864d95.tar.gz Qt-294f32f41da900ad3ae70e1546ea0057f8864d95.tar.bz2 | |
Alias for QUtf16Codec is wrong.
Requested/spotted by Nokia i18n team/Darpan.
Task-number: 252102
Reviewed-by: Denis
AutoTest: In this submit.
| -rw-r--r-- | src/corelib/codecs/qutfcodec.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index 281bf75..1ac592e 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -413,9 +413,7 @@ QByteArray QUtf16Codec::name() const QList<QByteArray> QUtf16Codec::aliases() const { - QList<QByteArray> list; - list << "ISO-10646-UCS-2"; - return list; + return QList<QByteArray>(); } int QUtf16BECodec::mibEnum() const diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index b1bfb86..536b695 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -68,6 +68,7 @@ private slots: void flagEFBFBF() const; void decode0D() const; void codecForIndex() const; + void aliasForUTF16() const; void utf8Codec_data(); void utf8Codec(); @@ -453,6 +454,11 @@ void tst_QTextCodec::codecForIndex() const { } +void tst_QTextCodec::aliasForUTF16() const +{ + QVERIFY(QTextCodec::codecForName("UTF-16")->aliases().isEmpty()); +} + static QString fromInvalidUtf8Sequence(const QByteArray &ba) { return QString().fill(QChar::ReplacementCharacter, ba.size()); |