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/codecs/qicucodec.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/codecs/qicucodec.cpp')
| -rw-r--r-- | src/corelib/codecs/qicucodec.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/codecs/qicucodec.cpp b/src/corelib/codecs/qicucodec.cpp index 295cbfe97f..6feb8a2070 100644 --- a/src/corelib/codecs/qicucodec.cpp +++ b/src/corelib/codecs/qicucodec.cpp @@ -43,7 +43,6 @@ #include "qutfcodec_p.h" #include "qlatincodec_p.h" #include "qsimplecodec_p.h" -#include "private/qcoreglobaldata_p.h" #include "qdebug.h" #include "unicode/ucnv.h" @@ -436,7 +435,7 @@ QList<int> QIcuCodec::availableMibs() QTextCodec *QIcuCodec::defaultCodecUnlocked() { - QCoreGlobalData *globalData = QCoreGlobalData::instance(); + QTextCodecData *globalData = QTextCodecData::instance(); if (!globalData) return nullptr; QTextCodec *c = globalData->codecForLocale.loadAcquire(); @@ -491,7 +490,7 @@ QTextCodec *QIcuCodec::codecForNameUnlocked(const char *name) standardName = "windows-949"; } - QCoreGlobalData *globalData = QCoreGlobalData::instance(); + QTextCodecData *globalData = QTextCodecData::instance(); QTextCodecCache *cache = &globalData->codecCache; QTextCodec *codec; |