Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I82da1e547c4ead1181ade19f77c62651c00998a3

1 files changed, 28 insertions, 1 deletions

diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml
index fc839493..0061440b 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/controls/data/tst_control.qml
@@ -53,7 +53,12 @@ TestCase {
 
     Component {
         id: component
-        T.Control { }
+        Control { }
+    }
+
+    Component {
+        id: rectangle
+        Rectangle { }
     }
 
     Component {
@@ -877,4 +882,26 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_implicitSize() {
+        var control = component.createObject(testCase)
+        verify(control)
+
+        compare(control.implicitWidth, 0)
+        compare(control.implicitHeight, 0)
+
+        control.contentItem = rectangle.createObject(control, {implicitWidth: 10, implicitHeight: 20})
+        compare(control.implicitWidth, 10)
+        compare(control.implicitHeight, 20)
+
+        control.background = rectangle.createObject(control, {implicitWidth: 20, implicitHeight: 30})
+        compare(control.implicitWidth, 20)
+        compare(control.implicitHeight, 30)
+
+        control.padding = 100
+        compare(control.implicitWidth, 210)
+        compare(control.implicitHeight, 220)
+
+        control.destroy()
+    }
 }