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

 Conflicts:
	tests/auto/quick/pointerhandlers/flickableinterop/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/Slider.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/TapHandlerButton.qml
	tests/auto/quick/pointerhandlers/flickableinterop/data/flickableWithHandlers.qml
	tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/pinchDragMPTA.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/DragAnywhereSlider.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/Slider.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/draggables.qml
	tests/auto/quick/pointerhandlers/qquickdraghandler/data/multipleSliders.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/FlashAnimation.qml
	tests/auto/quick/pointerhandlers/qquicktaphandler/data/buttons.qml
	tests/manual/pointer/content/FakeFlickable.qml
	tests/manual/pointer/content/FlashAnimation.qml
	tests/manual/pointer/content/MomentumAnimation.qml
	tests/manual/pointer/content/MouseAreaButton.qml
	tests/manual/pointer/content/MouseAreaSlider.qml
	tests/manual/pointer/content/MptaButton.qml
	tests/manual/pointer/content/MultiButton.qml
	tests/manual/pointer/content/ScrollBar.qml
	tests/manual/pointer/content/Slider.qml
	tests/manual/pointer/content/TapHandlerButton.qml
	tests/manual/pointer/fakeFlickable.qml
	tests/manual/pointer/flickableWithHandlers.qml
	tests/manual/pointer/flingAnimation.qml
	tests/manual/pointer/joystick.qml
	tests/manual/pointer/main.cpp
	tests/manual/pointer/main.qml
	tests/manual/pointer/map.qml
	tests/manual/pointer/map2.qml
	tests/manual/pointer/mixer.qml
	tests/manual/pointer/multibuttons.qml
	tests/manual/pointer/photosurface.qml
	tests/manual/pointer/pinchDragFlingMPTA.qml
	tests/manual/pointer/pinchHandler.qml
	tests/manual/pointer/singlePointHandlerProperties.qml
	tests/manual/pointer/tapHandler.qml
	tests/manual/pointer/tapWithModifiers.qml
	tests/manual/shapestest/main.cpp

Change-Id: I4f233a521305fab1ebfecbac801da192434ed524

1 files changed, 41 insertions, 1 deletions

diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 2e4d1a9b2d..666f80fce1 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -144,7 +144,8 @@ public:
     TestTouchItem(QQuickItem *parent = 0)
         : QQuickRectangle(parent), acceptTouchEvents(true), acceptMouseEvents(true),
           mousePressCount(0), mouseMoveCount(0),
-          spinLoopWhenPressed(false), touchEventCount(0)
+          spinLoopWhenPressed(false), touchEventCount(0),
+          mouseUngrabEventCount(0)
     {
         border()->setWidth(1);
         setAcceptedMouseButtons(Qt::LeftButton);
@@ -163,6 +164,7 @@ public:
         lastMouseCapabilityFlags = 0;
         touchEventCount = 0;
         mouseMoveCount = 0;
+        mouseUngrabEventCount = 0;
     }
 
     static void clearMouseEventCounters()
@@ -182,6 +184,7 @@ public:
     int mouseMoveCount;
     bool spinLoopWhenPressed;
     int touchEventCount;
+    int mouseUngrabEventCount;
     QVector2D lastVelocity;
     QVector2D lastVelocityFromMouseMove;
     QPointF lastMousePos;
@@ -235,6 +238,10 @@ public:
         lastMouseCapabilityFlags = QGuiApplicationPrivate::mouseEventCaps(e);
     }
 
+    void mouseUngrabEvent() {
+        ++mouseUngrabEventCount;
+    }
+
     bool childMouseEventFilter(QQuickItem *item, QEvent *e) {
         qCDebug(lcTests) << objectName() << "filtering" << e << "ahead of delivery to" << item->metaObject()->className() << item->objectName();
         switch (e->type()) {
@@ -315,6 +322,7 @@ private slots:
     void touchEvent_propagation();
     void touchEvent_propagation_data();
     void touchEvent_cancel();
+    void touchEvent_cancelClearsMouseGrab();
     void touchEvent_reentrant();
     void touchEvent_velocity();
 
@@ -833,6 +841,38 @@ void tst_qquickwindow::touchEvent_cancel()
     delete item;
 }
 
+void tst_qquickwindow::touchEvent_cancelClearsMouseGrab()
+{
+    TestTouchItem::clearMouseEventCounters();
+
+    QQuickWindow *window = new QQuickWindow;
+    QScopedPointer<QQuickWindow> cleanup(window);
+
+    window->resize(250, 250);
+    window->setPosition(100, 100);
+    window->setTitle(QTest::currentTestFunction());
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    TestTouchItem *item = new TestTouchItem(window->contentItem());
+    item->setPosition(QPointF(50, 50));
+    item->setSize(QSizeF(150, 150));
+    item->acceptMouseEvents = true;
+    item->acceptTouchEvents = false;
+
+    QPointF pos(50, 50);
+    QTest::touchEvent(window, touchDevice).press(0, item->mapToScene(pos).toPoint(), window);
+    QCoreApplication::processEvents();
+
+    QTRY_COMPARE(item->mousePressCount, 1);
+    QTRY_COMPARE(item->mouseUngrabEventCount, 0);
+
+    QWindowSystemInterface::handleTouchCancelEvent(0, touchDevice);
+    QCoreApplication::processEvents();
+
+    QTRY_COMPARE(item->mouseUngrabEventCount, 1);
+}
+
 void tst_qquickwindow::touchEvent_reentrant()
 {
     TestTouchItem::clearMouseEventCounters();