Revert "Fix memory leak of QFontEngineData"

This reverts commit addffb71b45b5123ee449f0cfa4891dcab044a9f.

The fix causes crashes on exit in Qt Declarative.

Change-Id: Ib1fc67c27fb1869b7824ba080083da67b8878fff
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index e1ab64b..f7675f5 100644 (file)
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -875,12 +875,16 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
 
     clearFontUnlocked();
 
+    QFont::cleanup();
+
 #ifndef QT_NO_CURSOR
     QCursorData::cleanup();
 #endif
 
     layout_direction = Qt::LeftToRight;
 
+    cleanupThreadData();
+
     delete styleHints;
     delete inputMethod;
 
@@ -892,10 +896,6 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
     delete platform_integration;
     platform_integration = 0;
     delete m_gammaTables.load();
-
-    QFont::cleanup();
-
-    cleanupThreadData();
 }
 
 #if 0