From be55fa95765c0d53fadddfce2e9aefa651cf791d Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Wed, 9 Jan 2019 13:37:37 +0100 Subject: Fix crash when assigning a Component to MapQuickItem.sourceItem This workaround is currently needed until QTBUG-72930 gets fixed in qtdeclarative. Change-Id: Id75fa2048dd6e012c99f61cdc07cfedbe8c6bf83 Fixes: QTBUG-61509 Reviewed-by: Alex Blasche --- src/location/declarativemaps/qdeclarativegeomapquickitem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp index 8c71e7be..5f9ecc8a 100644 --- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp @@ -249,9 +249,10 @@ QGeoCoordinate QDeclarativeGeoMapQuickItem::coordinate() */ void QDeclarativeGeoMapQuickItem::setSourceItem(QQuickItem *sourceItem) { - if (sourceItem_.data() == sourceItem) + QQuickItem *item = qobject_cast(sourceItem); // Workaround for QTBUG-72930 + if (sourceItem_.data() == item) return; - sourceItem_ = sourceItem; + sourceItem_ = item; polishAndUpdate(); emit sourceItemChanged(); } -- cgit v1.2.1