diff options
| author | Qt by Nokia <qt-info@nokia.com> | 2011-04-27 14:13:26 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 14:33:44 +0200 |
| commit | eae8fb85997d82ecec0743ba3e470681129bff41 (patch) | |
| tree | 286a31dce764e209a1e2db556d6c78d400561a2e /src/gui/text/qstatictext.cpp | |
| parent | 38be0d13830efd2d98281c645c3a60afe05ffece (diff) | |
Initial import from qtquick2.
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
Diffstat (limited to 'src/gui/text/qstatictext.cpp')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 1cfb4b61f9..5bee497a3e 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -714,17 +714,13 @@ QStaticTextItem::~QStaticTextItem() { if (m_userData != 0 && !m_userData->ref.deref()) delete m_userData; - if (!m_fontEngine->ref.deref()) - delete m_fontEngine; + m_fontEngine->ref.deref(); } void QStaticTextItem::setFontEngine(QFontEngine *fe) { - if (m_fontEngine != 0) { - if (!m_fontEngine->ref.deref()) - delete m_fontEngine; - } - + if (m_fontEngine != 0) + m_fontEngine->ref.deref(); m_fontEngine = fe; if (m_fontEngine != 0) m_fontEngine->ref.ref(); |