QQuickDisplayLayout: only use spacing if the image's width is > 0

Change-Id: I4b6b36da99633d5f9eebf090c5f0d8a3d2829e12
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quickcontrols2/qquickdisplaylayout.cpp b/src/quickcontrols2/qquickdisplaylayout.cpp
index 21fb4915..95062493 100644
--- a/src/quickcontrols2/qquickdisplaylayout.cpp
+++ b/src/quickcontrols2/qquickdisplaylayout.cpp
@@ -68,7 +68,7 @@ void QQuickDisplayLayoutPrivate::updateImplicitSize()
     const qreal iconImplicitHeight = showIcon ? icon->implicitHeight() : 0;
     const qreal textImplicitWidth = showText ? text->implicitWidth() : 0;
     const qreal textImplicitHeight = showText ? text->implicitHeight() : 0;
-    const qreal effectiveSpacing = showText && showIcon ? spacing : 0;
+    const qreal effectiveSpacing = showText && showIcon && icon->implicitWidth() > 0 ? spacing : 0;
     const qreal implicitWidth = iconImplicitWidth + textImplicitWidth + effectiveSpacing + horizontalPadding;
     const qreal implicitHeight = qMax(iconImplicitHeight, textImplicitHeight) + verticalPadding;
     q->setImplicitSize(implicitWidth, implicitHeight);
@@ -124,7 +124,7 @@ void QQuickDisplayLayoutPrivate::layout()
         }
         qreal effectiveSpacing = 0;
         if (text) {
-            if (icon)
+            if (iconWidth > 0)
                 effectiveSpacing = spacing;
             text->setWidth(qMin(text->implicitWidth(), availableWidth - iconWidth - effectiveSpacing));
             text->setHeight(qMin(text->implicitHeight(), availableHeight));