From: Glenn Watson <glenn.watson@nokia.com>
Date: Thu, 7 Jun 2012 00:06:14 +0000 (+1000)
Subject: Fix alpha being ignored in Text element
X-Git-Tag: 071012131707~196
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7ad506a4e46d3b3a2d3f6235e5c7df69b027311;p=profile%2Fivi%2Fqtdeclarative.git

Fix alpha being ignored in Text element

The text element was using the implicit constructor to convert
QRgb -> QColor which ignores alpha. Use the explicit conversion.

Change-Id: I7975ffeab8b423716b9655776f38b0ca2f282cd0
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
---

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 409f9a9..1f16cbd 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2165,7 +2165,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
             node->addTextLayout(
                         QPoint(0, bounds.y()),
                         &d->layout,
-                        d->color, d->style, d->styleColor, d->linkColor,
+                        color, d->style, styleColor, linkColor,
                         QColor(), QColor(), -1, -1,
                         0, unelidedLineCount);
         }