diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-23 17:12:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-23 17:13:07 +0200 |
| commit | 88f6c2fe36ebcf99f6928b7fd6e94c61840aa95e (patch) | |
| tree | b635886944904753a47db9f3836f0c7aada34a7d /src/location | |
| parent | ff5e2618d98cc547ebb2e4ff24e2ab5bb97f8168 (diff) | |
| parent | 888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f (diff) | |
| download | qtlocation-88f6c2fe36ebcf99f6928b7fd6e94c61840aa95e.tar.gz | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I122bd675639baca961882ec9d512900f4e7e773b
Diffstat (limited to 'src/location')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 7 | ||||
| -rw-r--r-- | src/location/doc/src/plugins/mapboxgl.qdoc | 2 |
2 files changed, 6 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; }; diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc index 1ff845a2..a412548e 100644 --- a/src/location/doc/src/plugins/mapboxgl.qdoc +++ b/src/location/doc/src/plugins/mapboxgl.qdoc @@ -53,6 +53,8 @@ The Mapbox GL geo services plugin can be loaded by using the plugin key "mapboxg Both Mapbox geo services plugins require an access token to access map styles and tiles hosted by Mapbox. To create a Mapbox account visit \l{https://www.mapbox.com/pricing}. +\b {Note:} the API for this plugin is introduced in Qt 5.9 as \e {technology preview}. + \section1 Platform Support Qt Location Mapbox GL Plugin has the following support for platforms: |