diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-06 14:21:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-07 13:07:25 +0100 |
| commit | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (patch) | |
| tree | 0798ae897d111147238544826c79243b6f9a48a4 /src/gui/text/qtextengine.cpp | |
| parent | 57fe9bd2c6a361cf979d17d962abed5db17a1457 (diff) | |
| parent | 65bd80ebfc1be81a196a861ade40ff874a3554f0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/android/androidjnimain.cpp
src/plugins/platforms/android/qandroidplatformintegration.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/sql/doc/src/sql-driver.qdoc
src/widgets/widgets/qtoolbararealayout.cpp
Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 14bdc3167e..2893d8b9b2 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1880,8 +1880,10 @@ QFontEngine *QTextEngine::fontEngine(const QScriptItem &si, QFixed *ascent, QFix feCache.prevFontEngine = engine; feCache.prevScript = script; engine->ref.ref(); - if (feCache.prevScaledFontEngine) + if (feCache.prevScaledFontEngine) { releaseCachedFontEngine(feCache.prevScaledFontEngine); + feCache.prevScaledFontEngine = 0; + } } if (si.analysis.flags & QFont::SmallCaps) { if (feCache.prevScaledFontEngine) { |