diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 18:43:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-09 18:43:14 (GMT) |
| commit | 587f4325850615392e99881e060121bd5ea85360 (patch) | |
| tree | c563522a355de79e857287a71a00115213262b81 /src/gui/text/qfont.cpp | |
| parent | 690e54dda08496d80526ae64dcb1fb88f533542b (diff) | |
| parent | 385f2c8a34a52443e78dfa272a1a483b9d6d29fc (diff) | |
| download | Qt-587f4325850615392e99881e060121bd5ea85360.zip Qt-587f4325850615392e99881e060121bd5ea85360.tar.gz Qt-587f4325850615392e99881e060121bd5ea85360.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable preserved swap behavior when surface is created due to resize.
Generate triggered signal even the action launches menu in Symbian.
Symbian emulator: unload file server so apps can be recompiled.
Clear QFontCache TLS content before nullifying TLS pointer.
Fixed focus and window activation events on Symbian when opening menu.
QTBUG-4887 and other exception safety fixes
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 dd9e69e..a41b000 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2612,8 +2612,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 |