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

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809

2 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickmousearea/data/availableDistanceLessThanDragThreshold.qml b/tests/auto/quick/qquickmousearea/data/availableDistanceLessThanDragThreshold.qml
new file mode 100644
index 0000000000..2b45a19340
--- /dev/null
+++ b/tests/auto/quick/qquickmousearea/data/availableDistanceLessThanDragThreshold.qml
@@ -0,0 +1,24 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 400
+    height: 200
+
+    MouseArea {
+        id: mouseArea
+        objectName: "mouseArea"
+        width: 200
+        height: 200
+
+        drag.target: mouseArea
+        drag.axis: Drag.XAxis
+        drag.minimumX: 0
+        drag.maximumX: 200
+        drag.threshold: 200
+
+        Rectangle {
+            anchors.fill: parent
+            color: "red"
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index c8351b9e18..01bce46ccb 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -88,6 +88,7 @@ private slots:
     void invalidDrag_data() { rejectedButton_data(); }
     void invalidDrag();
     void cancelDragging();
+    void availableDistanceLessThanDragThreshold();
     void setDragOnPressed();
     void updateMouseAreaPosOnClick();
     void updateMouseAreaPosOnResize();
@@ -585,6 +586,35 @@ void tst_QQuickMouseArea::cancelDragging()
     QTest::mouseRelease(&window, Qt::LeftButton, 0, QPoint(122,122));
 }
 
+// QTBUG-58347
+void tst_QQuickMouseArea::availableDistanceLessThanDragThreshold()
+{
+    QQuickView view;
+    QByteArray errorMessage;
+    QVERIFY2(initView(view, testFileUrl("availableDistanceLessThanDragThreshold.qml"), true, &errorMessage),
+             errorMessage.constData());
+    view.show();
+    view.requestActivate();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    QVERIFY(view.rootObject());
+
+    QQuickMouseArea *mouseArea = view.rootObject()->findChild<QQuickMouseArea*>("mouseArea");
+    QVERIFY(mouseArea);
+
+    QPoint position(100, 100);
+    QTest::mousePress(&view, Qt::LeftButton, 0, position);
+    QTest::qWait(10);
+    position.setX(301);
+    QTest::mouseMove(&view, position);
+    position.setX(501);
+    QTest::mouseMove(&view, position);
+    QVERIFY(mouseArea->drag()->active());
+    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+
+    QVERIFY(!mouseArea->drag()->active());
+    QCOMPARE(mouseArea->x(), 200.0);
+}
+
 void tst_QQuickMouseArea::setDragOnPressed()
 {
     QQuickView window;