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/qdeclarativecirclemapitem.cpp | |
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/qdeclarativecirclemapitem.cpp')
-rw-r--r-- | src/location/declarativemaps/qdeclarativecirclemapitem.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp index 2727cc26..b3496816 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp @@ -327,6 +327,7 @@ QDeclarativeCircleMapItem::QDeclarativeCircleMapItem(QQuickItem *parent) : QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true), updatingGeometry_(false) { + m_itemType = QGeoMap::MapCircle; setFlag(ItemHasContents, true); QObject::connect(&border_, SIGNAL(colorChanged(QColor)), this, SLOT(markSourceDirtyAndUpdate())); @@ -624,11 +625,6 @@ void QDeclarativeCircleMapItem::setGeoShape(const QGeoShape &shape) emit radiusChanged(circle_.radius()); } -QGeoMap::ItemType QDeclarativeCircleMapItem::itemType() const -{ - return QGeoMap::MapCircle; -} - /*! \internal */ |