diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-27 11:41:04 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-27 19:39:12 +0100 |
| commit | dc95cbee34ae58d1eb6d18ca99c30a28049e2a12 (patch) | |
| tree | de4807984418c01ac80bb20e106166a752513b11 | |
| parent | c5458eb447cc58bc59bd3c4cb50133f89c5cb16a (diff) | |
Fix tst_PointerHandlers::touchReleaseOutside
In Qt 6, setAcceptTouchEvents(true) must be done explicitly for an
item to receive touch events.
Task-number: QTBUG-86729
Change-Id: Ib18db22b6a7213dfcfdf091d554ef60fbede6111
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | tests/auto/quick/pointerhandlers/qquickpointerhandler/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/BLACKLIST b/tests/auto/quick/pointerhandlers/qquickpointerhandler/BLACKLIST deleted file mode 100644 index 006e8befd8..0000000000 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[touchReleaseOutside] -macos # QTBUG-86729 diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp index bb91547ef2..275ee06a29 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp @@ -623,17 +623,19 @@ void tst_PointerHandlers::touchReleaseOutside() QVERIFY(eventItem1); eventItem1->acceptTouch = true; + eventItem1->setAcceptTouchEvents(true); eventItem1->acceptPointer = acceptPointer; eventItem1->grabPointer = grabPointer; QPoint p1 = QPoint(20, 20); QTest::touchEvent(window, touchDevice).press(0, p1, window); QQuickTouchUtils::flush(window); + qCDebug(lcPointerTests) << "events after touch press" << eventItem1->eventList; p1.setX(eventItem1->mapToScene(eventItem1->clipRect().bottomRight()).x() + 10); QTest::touchEvent(window, touchDevice).move(0, p1, window); QTest::touchEvent(window, touchDevice).release(0, p1, window); QQuickTouchUtils::flush(window); - qCDebug(lcPointerTests) << eventItem1->eventList; + qCDebug(lcPointerTests) << "events after touch release" << eventItem1->eventList; QCOMPARE(eventItem1->eventList.size(), eventCount); QCOMPARE_EVENT(endIndexToTest, endDestination, endType, endState, endGrabState); } |