diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
| commit | 0f790634c57400f4ddffd36f5e3443c712d1a1c3 (patch) | |
| tree | 2b9f01a1798c5700f3c82e72a3db97dac6a625d5 /src/gui/text/qfont.cpp | |
| parent | 67e8e5baeec38d592596f259894e6dda420728ea (diff) | |
| parent | 119d7dddc8da189ccd1cbc55ed3292f311c30e0c (diff) | |
| download | Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.zip Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.gz Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.bz2 | |
Merge branch '4.7' of git@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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 99b9f40..cb16a16 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2614,8 +2614,10 @@ void QFontCache::cleanup() } QT_CATCH (const std::bad_alloc &) { // no cache - just ignore } - if (cache && cache->hasLocalData()) + if (cache && cache->hasLocalData()) { + cache->localData()->clear(); cache->setLocalData(0); + } } #endif // QT_NO_THREAD |