diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 02:03:30 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 02:03:30 +1000 |
| commit | 323e40b6bec0cbfab4c2b8d7a18e97304b3f6e47 (patch) | |
| tree | 507963fe94cddf49d9632dd980e3478e8aae5109 /src/corelib/codecs | |
| parent | af0749b1bf75f30eb956697fbe96bd75b80af031 (diff) | |
| parent | e30e6e1502e33bf5d1b4d9536a17c9fac9866bbe (diff) | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 985f5153ea..dd06a2a910 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -213,12 +213,13 @@ QTextCodecCleanup::~QTextCodecCleanup() destroying_is_ok = true; #endif - for (QList<QTextCodec *>::const_iterator it = all->constBegin() - ; it != all->constEnd(); ++it) { + QList<QTextCodec *> *myAll = all; + all = 0; // Otherwise the d'tor destroys the iterator + for (QList<QTextCodec *>::const_iterator it = myAll->constBegin() + ; it != myAll->constEnd(); ++it) { delete *it; } - delete all; - all = 0; + delete myAll; localeMapper = 0; #ifdef Q_DEBUG_TEXTCODEC |