diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 10:45:19 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 10:45:19 (GMT) |
| commit | 8b3df114cbb0f1961987b3660c1d51437dd911bf (patch) | |
| tree | 2d8d576c9ffec2f3bd4a71c4f0263ade225d7987 /src/corelib | |
| parent | ed3b35cff7ed7663971665e67d3a4037da8bd158 (diff) | |
| parent | 225b516ea21e841ee52d2f3edb426eb781ab0c8d (diff) | |
| download | Qt-8b3df114cbb0f1961987b3660c1d51437dd911bf.zip Qt-8b3df114cbb0f1961987b3660c1d51437dd911bf.tar.gz Qt-8b3df114cbb0f1961987b3660c1d51437dd911bf.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/codecs/qtsciicodec.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/codecs/qutfcodec.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp index 14d2c9c..0ec0567 100644 --- a/src/corelib/codecs/qtsciicodec.cpp +++ b/src/corelib/codecs/qtsciicodec.cpp @@ -180,8 +180,7 @@ QByteArray QTsciiCodec::name() const */ int QTsciiCodec::mibEnum() const { - /* There is no MIBEnum for TSCII now */ - return -3197; + return 2107; } static const int UnToTsLast = 124; // 125 items -- so the last will be 124 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 |