From c7f727996909338c3689396160f3060480521846 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 21 Aug 2020 13:34:52 +0200 Subject: Introduce QEvent::isPointerEvent() This makes high-level event dispatching easier: for example in Qt Quick, all pointer events should eventually be delivered to items in a similar way. Implemented in a similar way as d1111632e29124531d5b4512e0492314caaae396. Change-Id: I2f0c4914bab228162f3b932dda8a88051ec2a4d7 Reviewed-by: Volker Hilsheimer --- tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp | 2 ++ tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests') diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index da649c4400..258ea0c85d 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -115,6 +115,8 @@ void tst_QMouseEvent::mouseEventBasic() QPointF screen(300, 300); // Press left button QMouseEvent me(QEvent::MouseButtonPress, local, scene, screen, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + QVERIFY(me.isInputEvent()); + QVERIFY(me.isPointerEvent()); QCOMPARE(me.isAccepted(), true); QCOMPARE(me.button(), Qt::LeftButton); QCOMPARE(me.buttons(), Qt::LeftButton); diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 0b5de83018..332d04ecd4 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -302,6 +302,8 @@ void tst_QTouchEvent::state() QVERIFY(touchEvent.isPressEvent()); QVERIFY(!touchEvent.isUpdateEvent()); QVERIFY(!touchEvent.isReleaseEvent()); + QVERIFY(touchEvent.isInputEvent()); + QVERIFY(touchEvent.isPointerEvent()); touchEvent = QTouchEvent(QEvent::TouchBegin, touchScreenDevice, Qt::NoModifier, QList() << -- cgit v1.2.3