Merge remote-tracking branch 'origin/5.10' into 5.11

 Conflicts:
	src/location/declarativemaps/qdeclarativegeomap.cpp
	src/location/maps/qgeomap.cpp
	src/location/maps/qgeomap_p_p.h
	src/location/maps/qgeorouteparserosrmv5.cpp
	src/location/maps/qgeotiledmap.cpp
	src/positioning/positioning.pro

Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb

1 files changed, 14 insertions, 2 deletions

diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index 81eb3b14..f903b94e 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -150,6 +150,17 @@ QGeoMap::Capabilities QGeoTiledMap::capabilities() const
                         | SupportsAnchoringCoordinate);
 }
 
+void QGeoTiledMap::setCopyrightVisible(bool visible)
+{
+    Q_D(QGeoTiledMap);
+    if (visible == d->m_copyrightVisible)
+        return;
+
+    QGeoMap::setCopyrightVisible(visible);
+    if (visible)
+        evaluateCopyrights(d->m_mapScene->visibleTiles());
+}
+
 void QGeoTiledMap::clearScene(int mapId)
 {
     Q_D(QGeoTiledMap);
@@ -326,7 +337,7 @@ void QGeoTiledMapPrivate::updateScene()
     bool newTilesIntroduced = !m_mapScene->visibleTiles().contains(tiles);
     m_mapScene->setVisibleTiles(tiles);
 
-    if (newTilesIntroduced)
+    if (newTilesIntroduced && m_copyrightVisible)
         q->evaluateCopyrights(tiles);
 
     // don't request tiles that are already built and textured
@@ -388,7 +399,8 @@ void QGeoTiledMapPrivate::changeViewportSize(const QSize& size)
         m_cache->setMinTextureUsage(newSize);
     }
 
-    q->evaluateCopyrights(m_visibleTiles->createTiles());
+    if (m_copyrightVisible)
+        q->evaluateCopyrights(m_mapScene->visibleTiles());
     updateScene();
 }