Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	tests/auto/controls/data/tst_dialogbuttonbox.qml

Change-Id: I39ea99d988aaa7d1afd35d573cca44d009b859ce

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index 7d343cc6..27989703 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -220,4 +220,32 @@ TestCase {
         verify(button2)
         compare(button2.DialogButtonBox.buttonRole, data.button2Role)
     }
+
+    function test_implicitSize_data() {
+        return [
+            { tag: "Ok", standardButtons: DialogButtonBox.Ok },
+            { tag: "Yes|No", standardButtons: DialogButtonBox.Yes | DialogButtonBox.No }
+        ]
+    }
+
+    // QTBUG-59719
+    function test_implicitSize(data) {
+        var control = createTemporaryObject(buttonBox, testCase, {standardButtons: data.standardButtons})
+        verify(control)
+
+        var listView = control.contentItem
+        verify(listView && listView.hasOwnProperty("contentWidth"))
+        waitForRendering(listView)
+
+        var implicitContentWidth = control.leftPadding + control.rightPadding
+        for (var i = 0; i < listView.contentItem.children.length; ++i) {
+            var button = listView.contentItem.children[i]
+            if (!button.hasOwnProperty("text"))
+                continue
+            implicitContentWidth += button.implicitWidth
+        }
+
+        verify(implicitContentWidth > control.leftPadding + control.rightPadding)
+        verify(control.implicitWidth >= implicitContentWidth, qsTr("implicit width (%1) is less than content width (%2)").arg(control.implicitWidth).arg(implicitContentWidth))
+    }
 }