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, 9 insertions, 3 deletions

diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
index 0d7f7a20..73ce48f1 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
@@ -52,13 +52,14 @@
 #include <QtLocation/private/qlocationglobal_p.h>
 
 #include <QtGui/QImage>
+#include <QPointer>
 #include <QtQuick/QQuickPaintedItem>
 
 QT_BEGIN_NAMESPACE
 
 class QTextDocument;
 class QDeclarativeGeoMap;
-
+class QDeclarativeGeoMapCopyrightNoticePrivate;
 class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
 {
     Q_OBJECT
@@ -69,9 +70,10 @@ public:
     QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent = Q_NULLPTR);
     ~QDeclarativeGeoMapCopyrightNotice();
 
-    void setCopyrightsZ(int copyrightsZ);
+    void setCopyrightsZ(qreal copyrightsZ);
 
     void setCopyrightsVisible(bool visible);
+    bool copyrightsVisible() const;
     void anchorToBottomLeft();
 
     void setMapSource(QDeclarativeGeoMap *mapSource);
@@ -90,6 +92,7 @@ signals:
     void mapSourceChanged();
     void backgroundColorChanged(const QColor &color);
     void styleSheetChanged(const QString &styleSheet);
+    void copyrightsVisibleChanged();
 
 protected:
     void paint(QPainter *painter) Q_DECL_OVERRIDE;
@@ -106,10 +109,13 @@ private:
     QImage m_copyrightsImage;
     QString m_activeAnchor;
     bool m_copyrightsVisible;
-    QDeclarativeGeoMap *m_mapSource;
+    QPointer<QDeclarativeGeoMap> m_mapSource;
     QColor m_backgroundColor;
     QString m_styleSheet;
     bool m_userDefinedStyleSheet;
+
+    Q_DISABLE_COPY(QDeclarativeGeoMapCopyrightNotice)
+    Q_DECLARE_PRIVATE(QDeclarativeGeoMapCopyrightNotice)
 };
 
 QT_END_NAMESPACE