diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-04-25 11:11:23 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-14 07:48:20 +0200 |
commit | 1cab047d088a397b00f5adc8febeac467fc4831d (patch) | |
tree | b278b9b2e0a96e2ffcaefc44aabf6273271f57ef /src/corelib/kernel/qcoreglobaldata_p.h | |
parent | 940665eff5570323f4c00b61a4fc839b14cd823e (diff) |
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>
Diffstat (limited to 'src/corelib/kernel/qcoreglobaldata_p.h')
-rw-r--r-- | src/corelib/kernel/qcoreglobaldata_p.h | 11 |
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(); }; |