AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix memory leak of QFontEngineData"

Browse Source 
This reverts commit addffb71b4.

The fix causes crashes on exit in Qt Declarative.

Change-Id: Ib1fc67c27fb1869b7824ba080083da67b8878fff
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Lars Knoll 2012-04-18 08:57:32 +02:00 committed by Qt by Nokia
parent f5c3226f58
commit 23ad9c3cf2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/kernel/qguiapplication.cpp
View File

@ -875,12 +875,16 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
clearFontUnlocked(); clearFontUnlocked();
QFont::cleanup();
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
QCursorData::cleanup(); QCursorData::cleanup();
#endif #endif
layout_direction = Qt::LeftToRight; layout_direction = Qt::LeftToRight;
cleanupThreadData();
delete styleHints; delete styleHints;
delete inputMethod; delete inputMethod;
@ -892,10 +896,6 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
delete platform_integration; delete platform_integration;
platform_integration = 0; platform_integration = 0;
delete m_gammaTables.load(); delete m_gammaTables.load();
QFont::cleanup();
cleanupThreadData();
} }
#if 0 #if 0