diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2019-01-21 15:50:52 +0100 |
---|---|---|
committer | paolo <paolo.angelelli@qt.io> | 2019-05-28 13:30:28 +0200 |
commit | 24273e2249082a904b326c16a1913bcef3a37367 (patch) | |
tree | d51645bf219d7592813bfdb9b4a798b9c777ef27 /src/location/declarativemaps/qdeclarativegeomapitembase_p.h | |
parent | 1459f4474282c8804adf01f4faba70944771c5d7 (diff) | |
download | qtlocation-24273e2249082a904b326c16a1913bcef3a37367.tar.gz |
Fix crash when removing items from MapboxGL maps
Triggered by usage of a virtual method in superclass destructor.
Change-Id: If99e523e42fd13686ae43c0083a74e1b68221fc7
Fixes: QTBUG-67638
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 1ac41150501d3c5cc4a9a6ed9c93729687666553)
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitembase_p.h')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitembase_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h index 4eff32db..23fd1da6 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h @@ -99,7 +99,7 @@ public: QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *); - virtual QGeoMap::ItemType itemType() const = 0; + QGeoMap::ItemType itemType() const; qreal mapItemOpacity() const; void setParentGroup(QDeclarativeGeoMapItemGroup &parentGroup); @@ -119,6 +119,8 @@ protected: bool childMouseEventFilter(QQuickItem *item, QEvent *event); bool isPolishScheduled() const; + QGeoMap::ItemType m_itemType = QGeoMap::NoItem; + private Q_SLOTS: void baseCameraDataChanged(const QGeoCameraData &camera); void visibleAreaChanged(); |