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.cpp | |
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.cpp')
-rw-r--r-- | src/corelib/kernel/qcoreglobaldata.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp index 7ff222f170..4df5a40e39 100644 --- a/src/corelib/kernel/qcoreglobaldata.cpp +++ b/src/corelib/kernel/qcoreglobaldata.cpp @@ -38,31 +38,17 @@ ****************************************************************************/ #include "qcoreglobaldata_p.h" -#if QT_CONFIG(textcodec) -#include "qtextcodec.h" -#endif QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QCoreGlobalData, globalInstance) QCoreGlobalData::QCoreGlobalData() -#if QT_CONFIG(textcodec) - : codecForLocale(nullptr) -#endif { } QCoreGlobalData::~QCoreGlobalData() { -#if QT_CONFIG(textcodec) - codecForLocale = nullptr; - QList<QTextCodec *> tmp = allCodecs; - allCodecs.clear(); - codecCache.clear(); - for (QList<QTextCodec *>::const_iterator it = tmp.constBegin(); it != tmp.constEnd(); ++it) - delete *it; -#endif } QCoreGlobalData *QCoreGlobalData::instance() |