diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-08 10:07:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-08 10:22:45 (GMT) |
| commit | 383c336be79c9757a51427f06aa68df0b4849e31 (patch) | |
| tree | 1689e624cdc609f310509326bb2f7b74a29679c4 | |
| parent | 5ae2cbe99d06e1f1d037cd9a7868f2e1fd3f4c4c (diff) | |
| download | Qt-383c336be79c9757a51427f06aa68df0b4849e31.zip Qt-383c336be79c9757a51427f06aa68df0b4849e31.tar.gz Qt-383c336be79c9757a51427f06aa68df0b4849e31.tar.bz2 | |
Clear QFontCache TLS content before nullifying TLS pointer.
If not cleared server handles are left open causing
Font Server to Panic with KErrInUse in Symbian.
Task-number: QTBUG-9565
Reviewed-by: Simon Hausmann
| -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 |