Revert "Fix memory leak of QFontEngineData"

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

View File

@ -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