diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:31 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:31 +0200 |
| commit | f1dd13632651a9efd0ea976a3efdd9c555a34bc2 (patch) | |
| tree | c647c2741ed1be32c8ad8dac6c962fc79bf17fe4 /src/location/declarativemaps/qdeclarativegeomapitemview.cpp | |
| parent | 4ab5838d9ba26eef2b2156bbf9cd428547bbebe0 (diff) | |
| parent | 1688c44d223145abfdca19a7b31faecbafb0d315 (diff) | |
| download | qtlocation-f1dd13632651a9efd0ea976a3efdd9c555a34bc2.tar.gz | |
Merge 5.12 into 5.12.1
Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitemview.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index 41ab3453..d404fd47 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -175,6 +175,9 @@ void QDeclarativeGeoMapItemView::createdItem(int index, QObject */*object*/) void QDeclarativeGeoMapItemView::modelUpdated(const QQmlChangeSet &changeSet, bool reset) { + if (!m_map) // everything will be done in instantiateAllItems. Removal is done by declarativegeomap. + return; + // move changes are expressed as one remove + one insert, with the same moveId. // For simplicity, they will be treated as remove + insert. // Changes will be also ignored, as they represent only data changes, not layout changes |