Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: I9a361b46c1ff401d6e58c31b1fd46241ec9ebaea

2 files changed, 82 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 0e8b0835..cd493118 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -576,4 +576,51 @@ TestCase {
         verify(newHorizontalScrollBar.visible)
         verify(!oldHorizontalScrollBar.visible)
     }
+
+    Component {
+        id: bindingToContentItemAndStandaloneFlickable
+
+        Item {
+            width: 200
+            height: 200
+
+            property alias scrollView: scrollView
+
+            ScrollView {
+                id: scrollView
+                anchors.fill: parent
+                contentItem: listView
+
+                property Item someBinding: contentItem
+            }
+            ListView {
+                id: listView
+                model: 10
+                delegate: ItemDelegate {
+                    text: modelData
+                    width: listView.width
+                }
+            }
+        }
+    }
+
+    // Tests that scroll bars show up for a ScrollView where
+    // - its contentItem is declared as a standalone, separate item
+    // - there is a binding to contentItem (which causes a default Flickable to be created)
+    function test_bindingToContentItemAndStandaloneFlickable() {
+        let root = createTemporaryObject(bindingToContentItemAndStandaloneFlickable, testCase)
+        verify(root)
+
+        let control = root.scrollView
+        let verticalScrollBar = control.ScrollBar.vertical
+        let horizontalScrollBar = control.ScrollBar.horizontal
+        compare(verticalScrollBar.parent, control)
+        compare(horizontalScrollBar.parent, control)
+        verify(verticalScrollBar.visible)
+        verify(horizontalScrollBar.visible)
+
+        mouseDrag(verticalScrollBar, verticalScrollBar.width / 2, verticalScrollBar.height / 2, 0, 50)
+        verify(verticalScrollBar.active)
+        verify(horizontalScrollBar.active)
+    }
 }
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index e1e1ed97..bf65e486 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -923,4 +923,39 @@ TestCase {
 
         touch.release(0, control, x0 + data.dx2, y0 + data.dy2).commit()
     }
+
+    Component {
+        id: listViewWithPressDelayAndSliders
+        ListView {
+            width: 300
+            height: 500
+            model: 3
+            pressDelay: 150
+            delegate: Slider {
+                width: 300
+                height: 150
+            }
+        }
+    }
+
+    function test_listViewWithPressDelay() {
+        var listView = createTemporaryObject(listViewWithPressDelayAndSliders, testCase, { width: parent.width, height: parent.height })
+        verify(listView)
+        var control = listView.itemAtIndex(0)
+        verify(control)
+        var movedSpy = signalSpy.createObject(control, {target: control, signalName: "moved"})
+        verify(movedSpy.valid)
+
+        var touch = touchEvent(control)
+        var x0 = control.handle.x + control.handle.width * 0.5
+        var y0 = control.handle.y + control.handle.height * 0.5
+        touch.press(0, control, x0, y0).commit()
+        tryCompare(control, "pressed", true)
+        fuzzyCompare(control.value, 0, 0.01)
+
+        touch.move(0, control, x0 + 100, y0).commit()
+        tryVerify(function() { return (control.value > 0.3); }) // around 0.35, depending on style
+        tryVerify(function() { return (movedSpy.count > 0); }) // ideally == 1, but in Material and Fusion it's 2
+        touch.release(0)
+    }
 }