From 39cc7f0a2b65f4a283ce168a03a3ea65705d852f Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 20 Apr 2012 16:25:33 +1000 Subject: [PATCH] Remove uninitialized variable. Relic from a prospective change to defer layout of text in more circumstances. Change-Id: I75d14e8cb01b86ab36ddbf58da99ba1cde14d801 Reviewed-by: Yann Bodson --- src/quick/items/qquicktext.cpp | 5 +---- src/quick/items/qquicktext_p_p.h | 1 - 2 files changed, 1 insertions(+), 5 deletions(-) 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; -- 1.7.2.5