diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
| commit | 42d46a85a50926cd24d7216cb99b4084f6d8ad04 (patch) | |
| tree | 39a79b4709f6da1c04c60a5c3e5adf43c16f6169 /src/gui/text/qfont.cpp | |
| parent | 37b45fe0415bd6695640b26eb7545280b2e8ffe1 (diff) | |
| parent | a863691765b1788a17a67e826f483b68f0f34066 (diff) | |
| download | Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.zip Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.gz Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/text/qfont.cpp')
| -rw-r--r-- | src/gui/text/qfont.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 24887b5..21a31a3 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2616,10 +2616,8 @@ void QFontCache::cleanup() } QT_CATCH (const std::bad_alloc &) { // no cache - just ignore } - if (cache && cache->hasLocalData()) { - cache->localData()->clear(); + if (cache && cache->hasLocalData()) cache->setLocalData(0); - } } #endif // QT_NO_THREAD @@ -2631,6 +2629,7 @@ QFontCache::QFontCache() QFontCache::~QFontCache() { + clear(); { EngineDataCache::ConstIterator it = engineDataCache.constBegin(), end = engineDataCache.constEnd(); |