Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: I122bd675639baca961882ec9d512900f4e7e773b

1 files changed, 4 insertions, 3 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 45d84470..9f4dae3f 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -2139,11 +2139,12 @@ bool QDeclarativeGeoMap::sendMouseEvent(QMouseEvent *event)
 
 bool QDeclarativeGeoMap::sendTouchEvent(QTouchEvent *event)
 {
-    const QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
+    QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
     const QTouchEvent::TouchPoint &point = event->touchPoints().first();
+    QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window());
 
-    auto touchPointGrabberItem = [touchDevice](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
-        if (QQuickEventPoint *eventPointer = touchDevice->pointerEvent()->pointById(point.id()))
+    auto touchPointGrabberItem = [touchDevice, windowPriv](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
+        if (QQuickEventPoint *eventPointer = windowPriv->pointerEventInstance(touchDevice)->pointById(point.id()))
             return eventPointer->grabber();
         return nullptr;
     };