1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index d8c210a4..7404d0e6 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -502,4 +502,28 @@ TestCase {
         compare(control.contentWidth, flickable.contentWidth)
         compare(control.contentHeight, flickable.contentHeight)
     }
+
+    Component {
+        id: zeroSizedContentItemComponent
+        ScrollView {
+            width: 100
+            height: 100
+            contentItem: Item {}
+        }
+    }
+
+    function test_zeroSizedContentItem() {
+        ignoreWarning(/ScrollView only supports Flickable types as its contentItem/)
+        let control = createTemporaryObject(zeroSizedContentItemComponent, testCase)
+        verify(control)
+
+        let verticalScrollBar = control.ScrollBar.vertical
+        verify(verticalScrollBar)
+        // Scrolling a ScrollView with a zero-sized contentItem shouldn't crash.
+        mouseDrag(verticalScrollBar, verticalScrollBar.width / 2, verticalScrollBar.height / 2, 0, 50)
+
+        let horizontalScrollBar = control.ScrollBar.horizontal
+        verify(verticalScrollBar)
+        mouseDrag(horizontalScrollBar, horizontalScrollBar.width / 2, horizontalScrollBar.height / 2, 50, 0)
+    }
 }