From 24273e2249082a904b326c16a1913bcef3a37367 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 21 Jan 2019 15:50:52 +0100 Subject: 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 (cherry picked from commit 1ac41150501d3c5cc4a9a6ed9c93729687666553) Reviewed-by: Paolo Angelelli --- src/location/declarativemaps/qdeclarativerectanglemapitem.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/location/declarativemaps/qdeclarativerectanglemapitem.cpp') diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp index ba67ecad..74f95734 100644 --- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp @@ -118,6 +118,7 @@ QDeclarativeRectangleMapItem::QDeclarativeRectangleMapItem(QQuickItem *parent) : QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true), updatingGeometry_(false) { + m_itemType = QGeoMap::MapRectangle; setFlag(ItemHasContents, true); QObject::connect(&border_, SIGNAL(colorChanged(QColor)), this, SLOT(markSourceDirtyAndUpdate())); @@ -370,11 +371,6 @@ void QDeclarativeRectangleMapItem::setGeoShape(const QGeoShape &shape) emit bottomRightChanged(rectangle_.bottomRight()); } -QGeoMap::ItemType QDeclarativeRectangleMapItem::itemType() const -{ - return QGeoMap::MapRectangle; -} - /*! \internal */ -- cgit v1.2.1