Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1

Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3

2 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
index 3f0062c0..9174ad62 100644
--- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp
@@ -220,15 +220,16 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian
     if (parameters.contains(QStringLiteral("osm.mapping.providersrepository.disabled")))
         disableRedirection = parameters.value(QStringLiteral("osm.mapping.providersrepository.disabled")).toBool();
 
-    foreach (QGeoTileProviderOsm * provider, m_providers) {
+    for (QGeoTileProviderOsm * provider: qAsConst(m_providers)) {
         // Providers are parented inside QGeoFileTileCacheOsm, as they are used in its destructor.
-        if (disableRedirection)
+        if (disableRedirection) {
             provider->disableRedirection();
-
-        connect(provider, &QGeoTileProviderOsm::resolutionFinished,
-                this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionFinished);
-        connect(provider, &QGeoTileProviderOsm::resolutionError,
-                this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionError);
+        } else {
+            connect(provider, &QGeoTileProviderOsm::resolutionFinished,
+                    this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionFinished);
+            connect(provider, &QGeoTileProviderOsm::resolutionError,
+                    this, &QGeoTiledMappingManagerEngineOsm::onProviderResolutionError);
+        }
     }
     updateMapTypes();
 
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index 95e5d44b..f7ab8c99 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -174,11 +174,11 @@ void QGeoTileProviderOsm::disableRedirection()
         if (p->isValid() && !found) {
             m_provider = p;
             m_providerId = m_providerList.indexOf(p);
-            m_status = Resolved;
             found = true;
         }
         p->disconnect(this);
     }
+    m_status = Resolved;
 }
 
 void QGeoTileProviderOsm::onResolutionFinished(TileProvider *provider)