diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:06 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:06 +0100 |
commit | 485a631f2ae06e3328176049c51053e3047448bb (patch) | |
tree | 76ed7ca62abd4e9bdd24ba779df7c5c00609a028 /src/location/declarativemaps/qdeclarativegeomap.cpp | |
parent | 361a72a861a213a7bc735fbce7c3433a2f6a08cc (diff) | |
parent | afc51951769ac7320a98a973bcb95a12bc970019 (diff) | |
download | qtlocation-485a631f2ae06e3328176049c51053e3047448bb.tar.gz |
Merge 5.10 into 5.10.0
Change-Id: I81af4fc4e6dcc204b3657ec321820d6c7109e336
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 7087a50f..34885f54 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -2271,7 +2271,7 @@ bool QDeclarativeGeoMap::sendTouchEvent(QTouchEvent *event) auto touchPointGrabberItem = [touchDevice, windowPriv](const QTouchEvent::TouchPoint &point) -> QQuickItem* { if (QQuickEventPoint *eventPointer = windowPriv->pointerEventInstance(touchDevice)->pointById(point.id())) - return eventPointer->grabber(); + return eventPointer->grabberItem(); return nullptr; }; |