diff options
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
-rw-r--r-- | src/gui/text/qrawfont.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 2b7554a745..cb2bcb3eae 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -682,8 +682,7 @@ void QRawFont::setPixelSize(qreal pixelSize) if (d->fontEngine != 0) d->fontEngine->ref.ref(); - oldFontEngine->ref.deref(); - if (oldFontEngine->cache_count == 0 && oldFontEngine->ref == 0) + if (!oldFontEngine->ref.deref()) delete oldFontEngine; } @@ -693,12 +692,10 @@ void QRawFont::setPixelSize(qreal pixelSize) void QRawFontPrivate::cleanUp() { platformCleanUp(); - if (fontEngine != 0) { - fontEngine->ref.deref(); - if (fontEngine->cache_count == 0 && fontEngine->ref == 0) - delete fontEngine; - fontEngine = 0; - } + if (fontEngine != 0 && !fontEngine->ref.deref()) + delete fontEngine; + fontEngine = 0; + hintingPreference = QFont::PreferDefaultHinting; } |