diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-27 15:34:30 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-27 15:34:30 (GMT) |
| commit | 6330964f99366f31de85eda50e51a965d347868b (patch) | |
| tree | 44fec73ba97d73c1e4799c9269e45c0ce2d4f9e8 /src/corelib/codecs/qutfcodec.cpp | |
| parent | 2a0f0fdc016259dcc956599f41aa024ed06116b5 (diff) | |
| parent | 3cdde3b112f0c69e497d72d195b9ccc44d0048ab (diff) | |
| download | Qt-6330964f99366f31de85eda50e51a965d347868b.zip Qt-6330964f99366f31de85eda50e51a965d347868b.tar.gz Qt-6330964f99366f31de85eda50e51a965d347868b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/corelib/codecs/qutfcodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qutfcodec.cpp | 4 |
1 files changed, 1 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 |