From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Fri, 20 Apr 2012 06:25:33 +0000 (+1000)
Subject: Remove uninitialized variable.
X-Git-Tag: 071012131707~575
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39cc7f0a2b65f4a283ce168a03a3ea65705d852f;p=profile%2Fivi%2Fqtdeclarative.git

Remove uninitialized variable.

Relic from a prospective change to defer layout of text in more
circumstances.

Change-Id: I75d14e8cb01b86ab36ddbf58da99ba1cde14d801
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
---

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 2a6a6da..cfedfbd 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -2169,10 +2169,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
 void QQuickText::updatePolish()
 {
     Q_D(QQuickText);
-    if (d->updateLayoutOnPolish)
-        d->updateLayout();
-    else
-        d->updateSize();
+    d->updateSize();
 }
 
 /*!
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index cfa3778..2afcd8f 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -144,7 +144,6 @@ public:
 
     bool maximumLineCountValid:1;
     bool updateOnComponentComplete:1;
-    bool updateLayoutOnPolish:1;
     bool richText:1;
     bool styledText:1;
     bool singleline:1;