From fe90d7a3d9f00fa2ea46c0816f63c65f812c360f Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 1 Dec 2010 11:29:23 +1000
Subject: Change pen correctly when drawing cached text

Task-number: QTBUG-14568
---
 src/declarative/graphicsitems/qdeclarativetextlayout.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index e8da367..14a1109 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -361,10 +361,18 @@ void QDeclarativeTextLayout::draw(QPainter *painter, const QPointF &p)
         d->position = p;
     }
 
+    QPen oldPen = priv->state->pen;
+    QColor currentColor = oldPen.color();
     for (int ii = 0; ii < itemCount; ++ii) {
         QStaticTextItem &item = d->items[ii];
+        if (item.color.isValid() && currentColor != item.color) {
+            painter->setPen(item.color);
+            currentColor = item.color;
+        }
         priv->extended->drawStaticTextItem(&item);
     }
+    if (currentColor != oldPen.color())
+        painter->setPen(oldPen);
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12