Move the text codec list to qcoreglobaldata.

This removes some global statics in QTextCodec and
makes the code better to maintain in the longer term.

Remove QT_NO_THREAD defines around mutexes as this
isn't required in Qt 5 anymore.

Change-Id: I15ede75f53b16f134f4053f3188c4b47e86fcd8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h
index 50f619acf5..39281aa6e8 100644
--- a/src/corelib/kernel/qcoreglobaldata_p.h
+++ b/src/corelib/kernel/qcoreglobaldata_p.h
@@ -56,13 +56,25 @@
 #include "QtCore/qmap.h"
 #include "QtCore/qstringlist.h"
 #include "QtCore/qreadwritelock.h"
+#include "QtCore/qhash.h"
+#include "QtCore/qbytearray.h"
+#include "QtCore/qtextcodec.h"
 
 QT_BEGIN_NAMESPACE
 
+typedef QHash<QByteArray, QTextCodec *> QTextCodecCache;
+
 struct QCoreGlobalData {
+    QCoreGlobalData();
+    ~QCoreGlobalData();
+
     QMap<QString, QStringList> dirSearchPaths;
     QReadWriteLock dirSearchPathsLock;
 
+    QList<QTextCodec*> allCodecs;
+    QTextCodec *codecForLocale;
+    QTextCodecCache codecCache;
+
     static QCoreGlobalData *instance();
 };