diff options
| author | Igor Mironchik <igor.mironchik@gmail.com> | 2018-05-24 15:59:23 +0300 |
|---|---|---|
| committer | Igor Mironchik <igor.mironchik@gmail.com> | 2018-05-26 18:50:24 +0000 |
| commit | 03ab94b0e7a549bcf839639438f782a47522ffa7 (patch) | |
| tree | 837102d496567487e5418670a6897ff368c6334a /src/corelib/kernel/qcoreglobaldata.cpp | |
| parent | d4349f1acd0fcb7665cbb957dc0c77d4ca30470a (diff) | |
Deregister QTextCodec on destruction
QTextCodec automatically deregisters on destruction now.
[ChangeLog][QtCore][QTextCodec] QTextCodec automatically
deregisters on destruction now.
Task-number: QTBUG-56203
Change-Id: Ic9a66c512642c9913aa27ea5167b9f7341e7f0fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qcoreglobaldata.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreglobaldata.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp index e2087b9e64..88a45ef4ee 100644 --- a/src/corelib/kernel/qcoreglobaldata.cpp +++ b/src/corelib/kernel/qcoreglobaldata.cpp @@ -55,7 +55,10 @@ QCoreGlobalData::~QCoreGlobalData() { #if QT_CONFIG(textcodec) codecForLocale = 0; - for (QList<QTextCodec *>::const_iterator it = allCodecs.constBegin(); it != allCodecs.constEnd(); ++it) + QList<QTextCodec *> tmp = allCodecs; + allCodecs.clear(); + codecCache.clear(); + for (QList<QTextCodec *>::const_iterator it = tmp.constBegin(); it != tmp.constEnd(); ++it) delete *it; #endif } |