Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

All EGL-related changes from 4.6 were discarded.

Conflicts:
	src/gui/egl/egl.pri
	src/gui/egl/qegl.cpp
	src/gui/egl/qegl_p.h
	src/gui/egl/qegl_stub.cpp
	src/gui/egl/qeglproperties_p.h
	src/gui/egl/qeglproperties_stub.cpp
	src/gui/gui.pro
	src/multimedia/multimedia/audio/qaudioinput_win32_p.h
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtGuiu.def

1 files changed, 2 insertions, 3 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 24887b5d80..21a31a35ec 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2616,10 +2616,8 @@ void QFontCache::cleanup()
     } QT_CATCH (const std::bad_alloc &) {
         // no cache - just ignore
     }
-    if (cache && cache->hasLocalData()) {
-        cache->localData()->clear();
+    if (cache && cache->hasLocalData())
         cache->setLocalData(0);
-        }
 }
 #endif // QT_NO_THREAD
 
@@ -2631,6 +2629,7 @@ QFontCache::QFontCache()
 
 QFontCache::~QFontCache()
 {
+    clear();
     {
         EngineDataCache::ConstIterator it = engineDataCache.constBegin(),
                                  end = engineDataCache.constEnd();