diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 18:23:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 16:46:02 +0000 |
| commit | 3d2281ccf7400a782f69b7b74cb45d0889708bcc (patch) | |
| tree | 049703e99771e8cdb19abc33797fcb366d4b2df1 /src/location/declarativemaps/qdeclarativegeomapitembase_p.h | |
| parent | 572957bb1326190672ea138ccf475c0cf1893192 (diff) | |
| parent | f57956599925dd9eefe70d1b0cc31cb033414a33 (diff) | |
| download | qtlocation-3d2281ccf7400a782f69b7b74cb45d0889708bcc.tar.gz | |
Merge remote-tracking branch 'origin/wip/navigation' into 5.11
Conflicts:
src/location/declarativemaps/qgeomapobject.cpp
src/location/declarativemaps/qgeomapobject_p_p.h
src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitembase_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitembase_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h index 162c6d71..603bcafd 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h @@ -149,7 +149,7 @@ private Q_SLOTS: void baseCameraDataChanged(const QGeoCameraData &camera); private: - QGeoMap *map_; + QPointer<QGeoMap> map_; QDeclarativeGeoMap *quickMap_; QSizeF lastSize_; |