From b02eb3b436b49054fe972023c220b7760a0f48f5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 19 Jul 2013 14:08:14 -0700
Subject: 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>
---
 src/corelib/codecs/qtextcodec.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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;
 }
 
 /*!
-- 
cgit v1.2.3