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

Change-Id: I629cb2b733de2e5533d8ba9f1665d14f542979b9

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml
index 9f2456b8..45bc0dab 100644
--- a/tests/auto/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml
@@ -715,4 +715,39 @@ TestCase {
 
         control.destroy()
     }
+
+    Component {
+        id: testResizeBackground
+        Item {
+            width: 200
+            height: 200
+            property alias textArea: textArea
+            ScrollView {
+                anchors.fill: parent
+                ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+                TextArea {
+                    id: textArea
+                    wrapMode : TextEdit.WordWrap
+                    readOnly: false
+                    selectByMouse: true
+                    focus: true
+                    text: "test message"
+                }
+            }
+        }
+    }
+
+    function test_resize_background() {
+        var control = testCase.createTemporaryObject(testResizeBackground, testCase)
+        compare(control.textArea.background.height, 1)
+        compare(control.textArea.background.width, control.width)
+        control.width = 400
+        control.height = 400
+        compare(control.textArea.background.height, 1)
+        compare(control.textArea.background.width, control.width)
+        control.width = 200
+        control.height = 200
+        compare(control.textArea.background.height, 1)
+        compare(control.textArea.background.width, control.width)
+    }
 }