From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Wed, 25 Jan 2012 14:36:20 +0000 (+0100)
Subject: Fix updating of QML Text element
X-Git-Tag: upstream/5.2.1~2809
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e490a021ffe6be39e5942e57aa82f02977efe72d;p=platform%2Fupstream%2Fqtdeclarative.git

Fix updating of QML Text element

The negation in the test was left over from an earlier API and
would break the test and most likely cause the Text element to
always bypass its update.

Change-Id: Idc5c94a76a0477a9433305f5aba43c4bb8d67806
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
---

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 82232ab..969660a 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1865,7 +1865,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
         return 0;
     }
 
-    if (!d->updateType != QQuickTextPrivate::UpdatePaintNode && oldNode != 0) {
+    if (d->updateType != QQuickTextPrivate::UpdatePaintNode && oldNode != 0) {
         // Update done in preprocess() in the nodes
         d->updateType = QQuickTextPrivate::UpdateNone;
         return oldNode;