QQuickEventPoint::grabber: allow grabbing either an item or a handler

QQuickPointerHandler and QQuickItem have only QObject in common.

Change-Id: I8fb68cc1779f42049db1e0eb5ff60019a1c674d3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp b/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp
index bed1721a52..7d2842d688 100644
--- a/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp
+++ b/tests/auto/quick/pointerhandlers/tst_pointerhandlers.cpp
@@ -429,20 +429,19 @@ void tst_PointerHandlers::mouseEventDelivery()
 
     p1 += QPoint(10, 0);
     QTest::mouseMove(window, p1);
-    QCOMPARE(eventItem1->eventList.size(), 4);
-    QCOMPARE(eventItem1->eventList.at(2).type, QEvent::Pointer);
-    QCOMPARE(eventItem1->eventList.at(3).type, QEvent::MouseMove);
+    QCOMPARE(eventItem1->eventList.size(), 3);
+    QCOMPARE(eventItem1->eventList.at(2).type, QEvent::MouseMove);
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, p1);
-    QCOMPARE(eventItem1->eventList.size(), 7);
-    QCOMPARE(eventItem1->eventList.at(4).type, QEvent::Pointer);
-    QCOMPARE(eventItem1->eventList.at(5).type, QEvent::MouseButtonRelease);
-    QCOMPARE(eventItem1->eventList.at(6).type, QEvent::UngrabMouse);
+    QCOMPARE(eventItem1->eventList.size(), 5);
+    QCOMPARE(eventItem1->eventList.at(3).type, QEvent::MouseButtonRelease);
+    QCOMPARE(eventItem1->eventList.at(4).type, QEvent::UngrabMouse);
     eventItem1->eventList.clear();
 
     // wait to avoid getting a double click event
     QTest::qWait(qApp->styleHints()->mouseDoubleClickInterval() + 10);
 
     // Accept pointer events
+    eventItem1->acceptMouse = false;
     eventItem1->acceptPointer = true;
     p1 = QPoint(20, 20);
     QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, p1);