Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I61bff0de1d7f1ee4d73612af07cbac8d7400b534

1 files changed, 0 insertions, 35 deletions

diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml
index 45bc0dab..9f2456b8 100644
--- a/tests/auto/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml
@@ -715,39 +715,4 @@ 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)
-    }
 }