diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:29:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:29:21 +0200 |
| commit | 2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452 (patch) | |
| tree | fe8efd84d270b8b1a884f3da042400808fbd5b9f /src/location/declarativemaps/qdeclarativecirclemapitem.cpp | |
| parent | 0e64148b39ab7e7417d9d115ddc53631167989b1 (diff) | |
| parent | 058427e68159fb286c465da32cb696f757ea2b52 (diff) | |
| download | qtlocation-2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
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 */ |