Remove uninitialized variable.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Fri, 20 Apr 2012 06:25:33 +0000 (16:25 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 20 Apr 2012 07:46:02 +0000 (09:46 +0200)
Relic from a prospective change to defer layout of text in more
circumstances.

Change-Id: I75d14e8cb01b86ab36ddbf58da99ba1cde14d801
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
src/quick/items/qquicktext.cpp
src/quick/items/qquicktext_p_p.h

index 2a6a6da..cfedfbd 100644 (file)
@@ -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();
 }
 
 /*!
index cfa3778..2afcd8f 100644 (file)
@@ -144,7 +144,6 @@ public:
 
     bool maximumLineCountValid:1;
     bool updateOnComponentComplete:1;
-    bool updateLayoutOnPolish:1;
     bool richText:1;
     bool styledText:1;
     bool singleline:1;