Remove QTextCodec dependency from QCoreGobalData

As we want to move text codecs out of Qt Core, disentangle the
dependency, but moving the global codec data into qtextcodec.*.

Change-Id: Id7498423c7c4f9f42fd00c450947305d2af8c4be
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 0 insertions, 11 deletions

diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h
index fda6b52b6e..2b9677efd9 100644
--- a/src/corelib/kernel/qcoreglobaldata_p.h
+++ b/src/corelib/kernel/qcoreglobaldata_p.h
@@ -57,15 +57,10 @@
 #include "QtCore/qreadwritelock.h"
 #include "QtCore/qhash.h"
 #include "QtCore/qbytearray.h"
-#if QT_CONFIG(textcodec)
-#include "QtCore/qtextcodec.h"
-#endif
 #include "QtCore/qmutex.h"
 
 QT_BEGIN_NAMESPACE
 
-typedef QHash<QByteArray, QTextCodec *> QTextCodecCache;
-
 struct QCoreGlobalData {
     QCoreGlobalData();
     ~QCoreGlobalData();
@@ -73,12 +68,6 @@ struct QCoreGlobalData {
     QMap<QString, QStringList> dirSearchPaths;
     QReadWriteLock dirSearchPathsLock;
 
-#if QT_CONFIG(textcodec)
-    QList<QTextCodec*> allCodecs;
-    QAtomicPointer<QTextCodec> codecForLocale;
-    QTextCodecCache codecCache;
-#endif
-
     static QCoreGlobalData *instance();
 };