aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/pointerhandlers
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/pointerhandlers')
-rw-r--r--tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST2
-rw-r--r--tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp13
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST b/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST
deleted file mode 100644
index 3ca1bf70c1..0000000000
--- a/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[dragHandlerInSiblingStealingGrabFromMouseAreaViaTouch]
-macos # QTBUG-86729
diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp
index 44d0e9a27a..4709622245 100644
--- a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp
+++ b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp
@@ -126,7 +126,7 @@ void tst_MouseAreaInterop::dragHandlerInSiblingStealingGrabFromMouseAreaViaTouch
QScopedPointer<QQuickView> windowPtr;
createView(windowPtr, "dragTakeOverFromSibling.qml");
QQuickView * window = windowPtr.data();
- auto devPriv = QPointingDevicePrivate::get(QPointingDevice::primaryPointingDevice());
+ auto devPriv = QPointingDevicePrivate::get(touchDevice);
QPointer<QQuickPointerHandler> handler = window->rootObject()->findChild<QQuickPointerHandler*>();
QVERIFY(handler);
@@ -139,9 +139,12 @@ void tst_MouseAreaInterop::dragHandlerInSiblingStealingGrabFromMouseAreaViaTouch
touch.press(1, p1).commit();
QQuickTouchUtils::flush(window);
- QTRY_VERIFY(devPriv->pointById(0)->passiveGrabbers.contains(handler.data()));
- QCOMPARE(devPriv->pointById(0)->exclusiveGrabber, ma);
- QCOMPARE(window->mouseGrabberItem(), ma);
+ QTRY_VERIFY(!devPriv->activePoints.isEmpty());
+ qCDebug(lcPointerTests) << "active point after press:" << devPriv->activePoints.values().first().eventPoint;
+ auto epd = devPriv->queryPointById(1);
+ QVERIFY(epd);
+ QVERIFY(epd->passiveGrabbers.contains(handler.data()));
+ QCOMPARE(epd->exclusiveGrabber, ma);
QCOMPARE(ma->pressed(), true);
// Start dragging
@@ -152,7 +155,7 @@ void tst_MouseAreaInterop::dragHandlerInSiblingStealingGrabFromMouseAreaViaTouch
p1 += QPoint(dragThreshold / 2, 0);
touch.move(1, p1).commit();
QQuickTouchUtils::flush(window);
- if (!dragStoleGrab && devPriv->pointById(0)->exclusiveGrabber == handler)
+ if (!dragStoleGrab && epd->exclusiveGrabber == handler)
dragStoleGrab = i;
}
if (dragStoleGrab)