From 37b0988dcebb6a44a2e50194e78540bf4dd71bc0 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Wed, 22 Sep 2010 10:11:41 +0200
Subject: Keep other text format with QTextOption::SuppressColors tag on

Setting the QTextOption::SuppressColors tag on a QTextDocument
breaks all text format, not just colors. This patch fix this by
selectively ignoring color properties in the format and keeping
other properties.

Task-number: QTBUG-13090
Reviewed-by: Eskil
---
 src/gui/text/qtextlayout.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 3f83aee..fad6c3b2 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -2438,8 +2438,12 @@ void QTextLine::draw(QPainter *p, const QPointF &pos, const QTextLayout::FormatR
         QTextCharFormat format;
 
         if (eng->hasFormats() || selection) {
-            if (!suppressColors)
-                format = eng->format(&si);
+            format = eng->format(&si);
+            if (suppressColors) {
+                format.clearForeground();
+                format.clearBackground();
+                format.clearProperty(QTextFormat::TextUnderlineColor);
+            }
             if (selection)
                 format.merge(selection->format);
 
-- 
cgit v0.12