diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-12 06:39:45 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-12 06:39:45 (GMT) |
| commit | 757b9bf63dedbc33205f482c80f6843b738aa389 (patch) | |
| tree | c352479613d29878e57de82b4141c17af662d044 /src/gui/text | |
| parent | f710d57af1cc03af143573135390e6c68eecbfe8 (diff) | |
| parent | 27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (diff) | |
| download | Qt-757b9bf63dedbc33205f482c80f6843b738aa389.zip Qt-757b9bf63dedbc33205f482c80f6843b738aa389.tar.gz Qt-757b9bf63dedbc33205f482c80f6843b738aa389.tar.bz2 | |
Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7
Conflicts:
src/3rdparty/phonon/ds9/mediaobject.cpp
Diffstat (limited to 'src/gui/text')
| -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 |