summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-02-13 10:58:10 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-02-21 11:22:37 +0000
commit144b206099a198868ab955e3b89dcfb200deb3cb (patch)
treec14b08b9fdc840ca748accbb8d5e8a2d83d42790
parentc2f6604a3334069aeee22b4094a589cd12a56308 (diff)
downloadqtlocation-144b206099a198868ab955e3b89dcfb200deb3cb.tar.gz
Change QDeclarativeGeoMapItemBase::map_ into a QPointer
Or else it may cause crashes on shutdown due to map_ not being parented with QDeclarativeGeoMap and potentially being deleted earlier. Change-Id: I2bed1c884eb556e48261371e889aae5e190476bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapitembase_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
index edb97c10..e1083c0e 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
@@ -116,7 +116,7 @@ private Q_SLOTS:
void baseCameraDataChanged(const QGeoCameraData &camera);
private:
- QGeoMap *map_;
+ QPointer<QGeoMap> map_;
QDeclarativeGeoMap *quickMap_;
QSizeF lastSize_;