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

[QStaticText] Fix potential font engine leaking

Browse Source 
Never assume the engine is still cached but rather delete it
if we are the last consumer.

Change-Id: I4e3c796d45c53f42722a437482d71e2dae14cad2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2014-11-21 10:35:13 +04:00
parent e8ba85b944
commit d911f1dd42
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/text/qstatictext.cpp
View File

@ -722,14 +722,19 @@ QStaticTextItem::~QStaticTextItem()
{ {
if (m_userData != 0 && !m_userData->ref.deref()) if (m_userData != 0 && !m_userData->ref.deref())
delete m_userData; delete m_userData;
m_fontEngine->ref.deref(); setFontEngine(0);
} }
void QStaticTextItem::setFontEngine(QFontEngine *fe) void QStaticTextItem::setFontEngine(QFontEngine *fe)
{ {
if (m_fontEngine != 0) if (m_fontEngine == fe)
m_fontEngine->ref.deref(); return;
if (m_fontEngine != 0 && !m_fontEngine->ref.deref())
delete m_fontEngine;
m_fontEngine = fe; m_fontEngine = fe;
if (m_fontEngine != 0) if (m_fontEngine != 0)
m_fontEngine->ref.ref(); m_fontEngine->ref.ref();
} }