Fix build with latest qtbase and qtdeclarative

* Bump the submodule to include the one build fix for sqlite3.
* Rename VisualDataModel to DelegateModel (it's been the latter for many
  years and now the old name vanished)
* Fix dangling pointers into QList. In clearMapItems() we iterate over
  m_mapItems and call removeMapItems(), which also removes from the same
  QList (now vector). The same goes for m_mapItemGroups.

Change-Id: I4c229fd2cf1bce76d6ad5ffae4bdbda7fe8e6a18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 11 insertions, 7 deletions

diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native
-Subproject d9577fdebe019b19e184b4cac82749ae9ec87af
+Subproject 8af62305d2e0208357c98e61bc2a9c9de8fe611
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 6a2d82e8..167f1d5f 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
@@ -2058,20 +2058,24 @@ void QDeclarativeGeoMap::clearMapItems()
         return;
 
     int removed = 0;
-    for (auto i : qAsConst(m_mapItemGroups)) {
+    for (int i = 0; i < m_mapItemGroups.count(); ++i) {
+        auto item = m_mapItemGroups.at(i);
         // Processing only top-level groups (!views)
-        QDeclarativeGeoMapItemView *view = qobject_cast<QDeclarativeGeoMapItemView *>(i);
-        if (view)
+        if (qobject_cast<QDeclarativeGeoMapItemView *>(item))
             continue;
 
-        if (i->parentItem() != this)
+
+        if (item->parentItem() != this)
             continue;
 
-        removed += removeMapItemGroup_real(i);
+        if (removeMapItemGroup_real(item)) {
+            removed++;
+            --i;
+        }
     }
 
-    for (auto i : qAsConst(m_mapItems))
-        removed += removeMapItem_real(i);
+    while (!m_mapItems.isEmpty())
+        removed += removeMapItem_real(m_mapItems.first());
 
     if (removed)
         emit mapItemsChanged();