diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-18 08:57:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 08:58:58 +0200 |
| commit | 23ad9c3cf2892aae3a3ef30b85832e59500abad9 (patch) | |
| tree | 367057ed895e144a802183ef15ca2b8f6f345c71 /src/gui | |
| parent | f5c3226f587553d2af1d2ef273d653e226c914b9 (diff) | |
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index e1ab64bc33..f7675f5267 100644 --- 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 |