summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@qt.io>2017-05-11 17:20:54 +0200
committerSimo Fält <simo.falt@qt.io>2017-05-19 07:36:54 +0000
commit30334f34f3af873262b67ccad3b8ffc5331b1c57 (patch)
tree444921589aad159998587dcb3635cdc0ae42b019
parent87681b757206a4c18a72cfa8c92d10c1a09d4af3 (diff)
downloadqtlocation-30334f34f3af873262b67ccad3b8ffc5331b1c57.tar.gz
Fix compile due to change in private API in qtdeclarative
e0c30279ec1fad88346ed3fb483bc3c672fdd01b in qtdeclarative changed some private APIs, so we need to adjust code correspondingly. Task-number: QTBUG-57253 Change-Id: I0cf30b5f4aaf5c040d72a384d87b0fe277a84d27 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
-rw-r--r--src/location/declarativemaps/qdeclarativegeomap.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 2c699aa6..49622828 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;
};