From 4f2872c64fc1e3a5a0fd58a94c521f4b128f4a5c Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sat, 15 Mar 2014 01:20:36 +0200
Subject: Make QTextEngine::setAdditionalFormats() invalidate cached results

...which ensures we're not getting the formatting/rendering
artefacts in case of QStackTextEngine.

Change-Id: Ia0696a3e67eb866cf9776c6649c43775944edd1d
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/gui/text/qtextengine.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 0298adde7a..3b079b7ee3 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2374,6 +2374,7 @@ void QTextEngine::freeMemory()
         layoutData->hasBidi = false;
         layoutData->layoutState = LayoutEmpty;
         layoutData->haveCharAttributes = false;
+        layoutData->items.clear();
     }
     for (int i = 0; i < lines.size(); ++i) {
         lines[i].justified = 0;
@@ -2520,7 +2521,8 @@ void QTextEngine::setAdditionalFormats(const QList<QTextLayout::FormatRange> &fo
         specialData->addFormats = formatList;
         indexAdditionalFormats();
     }
-    resetFontEngineCache();
+    invalidate();
+    clearLineData();
 }
 
 void QTextEngine::indexAdditionalFormats()
-- 
cgit v1.2.3