aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktext.cpp
diff options
context:
space:
mode:
authorGlenn Watson <glenn.watson@nokia.com>2012-06-07 10:06:14 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-07 02:12:27 +0200
commitc7ad506a4e46d3b3a2d3f6235e5c7df69b027311 (patch)
tree232b0630ccfee61f96145e53bcfbd5d052121e08 /src/quick/items/qquicktext.cpp
parentd65688b8328b31b8554ccedab8c8a792b530ee4e (diff)
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>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
-rw-r--r--src/quick/items/qquicktext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 409f9a9a3f..1f16cbdb51 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);
}