QQuickIconLabel: don't post-pone implicit size calculation

QQuickText is optimized to avoid unnecessary implicit size calcuation.
It can make a big difference whether QQuickText::implicitWidth() is
called while the text element is complete. "Bind" to QQuickText's
implicit size directly to let it apply the optimization tricks. This
way QQuickTextPrivate::setupTextLayout() is called only once during
the construction of QQuickIconLabel. Only layouting is post-poned
until component completion anymore.

Change-Id: Ide6bbddadf7d36ab908064b8545e1b4ed9474455
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 0 insertions, 4 deletions

diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp
index 4ce89edd..793bb255 100644
--- a/src/quickcontrols2/qquickiconlabel.cpp
+++ b/src/quickcontrols2/qquickiconlabel.cpp
@@ -57,9 +57,6 @@ QQuickIconLabelPrivate::QQuickIconLabelPrivate()
 void QQuickIconLabelPrivate::updateImplicitSize()
 {
     Q_Q(QQuickIconLabel);
-    if (!componentComplete)
-        return;
-
     const bool showIcon = icon && display != QQuickIconLabel::TextOnly;
     const bool showText = label && display != QQuickIconLabel::IconOnly;
     const qreal horizontalPadding = leftPadding + rightPadding;
@@ -389,7 +386,6 @@ void QQuickIconLabel::componentComplete()
 {
     Q_D(QQuickIconLabel);
     QQuickItem::componentComplete();
-    d->updateImplicitSize();
     d->layout();
 }