Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ib45654e3e79087da4754377f0d78b70c44ed4695

2 files changed, 8 insertions, 3 deletions

diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 17c09805aa..cabfb97914 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -4094,9 +4094,10 @@ void tst_qquickvisualdatamodel::asynchronousRemove()
             controller.incubateFor(50);
         } while (timer.elapsed() < 1000 && controller.incubatingObjectCount() > 0);
 
-        QVERIFY(requester.itemInitialized);
-        QCOMPARE(requester.itemCreated, requester.itemInitialized);
-        QCOMPARE(requester.itemDestroyed, requester.itemInitialized);
+        // The item was removed before incubation started. We should not have any item created.
+        QVERIFY(!requester.itemInitialized);
+        QVERIFY(!requester.itemCreated);
+        QVERIFY(!requester.itemDestroyed);
     } else {
         item = qobject_cast<QQuickItem*>(visualModel->object(completeIndex, false));
         QVERIFY(item);
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 15d7ffd9d9..72cc76a855 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -1235,8 +1235,12 @@ void tst_TouchMouse::hoverEnabled()
     // device->setType(QTouchDevice::TouchScreen);
     // QWindowSystemInterface::registerTouchDevice(device);
 
+    // Ensure the cursor is away from the window
+    QCursor::setPos(0, 0);
+
     QQuickView *window = createView();
     window->setSource(testFileUrl("hoverMouseAreas.qml"));
+    window->setPosition(10, 10);
 
     window->show();
     window->requestActivate();