diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-08-10 11:37:56 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-08-10 11:38:31 +0200 |
| commit | 93e0c9cbca1a66b2fc6ec1d2b12e25b5e734aef0 (patch) | |
| tree | 65479a233204bbdf790794192976a8b347c3406a /src/location/declarativemaps/qquickgeomapgesturearea.cpp | |
| parent | 677f7f76d4a0023d278b4d031d620fe63c3be27a (diff) | |
| parent | c832af789766fcebd8cfb15e53ce14f36278ca6d (diff) | |
| download | qtlocation-93e0c9cbca1a66b2fc6ec1d2b12e25b5e734aef0.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/declarative_ui/tst_map.qml
Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
Diffstat (limited to 'src/location/declarativemaps/qquickgeomapgesturearea.cpp')
| -rw-r--r-- | src/location/declarativemaps/qquickgeomapgesturearea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index 39fd2397..fc2debc3 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -498,7 +498,7 @@ QQuickGeoMapGestureArea::QQuickGeoMapGestureArea(QDeclarativeGeoMap *map) /*! \internal */ -void QQuickGeoMapGestureArea::setMap(QPointer<QGeoMap> map) +void QQuickGeoMapGestureArea::setMap(QGeoMap *map) { if (m_map || !map) return; |