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

Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_scrollindicator.qml

Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index 1e28c4f5..a6275f91 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.qml
@@ -66,6 +66,11 @@ TestCase {
     }
 
     Component {
+        id: mouseArea
+        MouseArea { }
+    }
+
+    Component {
         id: flickable
         Flickable {
             width: 100
@@ -231,4 +236,26 @@ TestCase {
         compare(control.horizontal, true)
         compare(control.vertical, false)
     }
+
+    // QTBUG-61785
+    function test_mouseArea() {
+        var ma = createTemporaryObject(mouseArea, testCase, {width: testCase.width, height: testCase.height})
+        verify(ma)
+
+        var control = scrollIndicator.createObject(ma, {active: true, size: 0.9, width: testCase.width, height: testCase.height})
+        verify(control)
+
+        mousePress(control)
+        verify(ma.pressed)
+
+        mouseRelease(control)
+        verify(!ma.pressed)
+
+        var touch = touchEvent(control)
+        touch.press(0, control).commit()
+        verify(ma.pressed)
+
+        touch.release(0, control).commit()
+        verify(!ma.pressed)
+    }
 }