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

 Conflicts:
	tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
	tests/plugins/declarativetestplugin/testhelper.h

Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e

1 files changed, 11 insertions, 1 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index 5c568d8f..e552affe 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -61,6 +61,7 @@
 #include <QtGui/QColor>
 #include <QtPositioning/qgeorectangle.h>
 #include <QtLocation/private/qgeomap_p.h>
+#include <QtQuick/private/qquickitemchangelistener_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -189,6 +190,9 @@ public:
     QString errorString() const;
     QGeoServiceProvider::Error error() const;
 
+    // From QQuickItem
+    void itemChange(ItemChange, const ItemChangeData &) override;
+
 Q_SIGNALS:
     void pluginChanged(QDeclarativeGeoServiceProvider *plugin);
     void zoomLevelChanged(qreal zoomLevel);
@@ -239,9 +243,9 @@ protected:
 private Q_SLOTS:
     void mappingManagerInitialized();
     void pluginReady();
-    void onMapChildrenChanged();
     void onSupportedMapTypesChanged();
     void onCameraCapabilitiesChanged(const QGeoCameraCapabilities &oldCameraCapabilities);
+    void onAttachedCopyrightNoticeVisibilityChanged();
 
 private:
     void setupMapView(QDeclarativeGeoMapItemView *view);
@@ -250,6 +254,8 @@ private:
     void fitViewportToMapItemsRefine(bool refine, bool onlyVisible);
     void fitViewportToGeoShape();
     bool isInteractive();
+    void attachCopyrightNotice(bool initialVisibility);
+    void detachCopyrightNotice(bool currentVisibility);
 
 private:
     QDeclarativeGeoServiceProvider *m_plugin;
@@ -287,6 +293,10 @@ private:
     qreal m_userMinimumFieldOfView;
     qreal m_userMaximumFieldOfView;
 
+    int m_copyNoticesVisible = 0;
+    qreal m_maxChildZ = 0;
+
+
     friend class QDeclarativeGeoMapItem;
     friend class QDeclarativeGeoMapItemView;
     friend class QQuickGeoMapGestureArea;