From 4c425feb08cd4aad31a99e92fec3fbbde0349d95 Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Thu, 8 Apr 2010 13:07:27 +0300
Subject: 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
---
 src/gui/text/qfont.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui/text')

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 9b85c0410b..c221e55dda 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
 
-- 
cgit v1.2.1