diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-19 14:08:14 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-21 07:30:48 +0200 |
| commit | b02eb3b436b49054fe972023c220b7760a0f48f5 (patch) | |
| tree | e3d9ebfd244c883cd43446f4218cdbe34b7ca63b /src | |
| parent | bad93acfba492954543a293dbf87769a6953d630 (diff) | |
Ensure that the user codecs are listed in QTextCodec::availableCodecs
Codecs registered by creating new QTextCodec instances should be listed
there.
Task-number: QTBUG-32500
Change-Id: I56c00e0d6bbfef55a6cbd571bcf9aa2cf333ef3a
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 4ed7b00e53..766e48358d 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -600,9 +600,6 @@ QTextCodec* QTextCodec::codecForMib(int mib) */ QList<QByteArray> QTextCodec::availableCodecs() { -#ifdef QT_USE_ICU - return QIcuCodec::availableCodecs(); -#else QMutexLocker locker(textCodecsMutex()); QCoreGlobalData *globalData = QCoreGlobalData::instance(); @@ -616,8 +613,11 @@ QList<QByteArray> QTextCodec::availableCodecs() codecs += globalData->allCodecs.at(i)->aliases(); } - return codecs; +#ifdef QT_USE_ICU + codecs += QIcuCodec::availableCodecs(); #endif + + return codecs; } /*! |