Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	.qmake.conf

Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7

2 files changed, 24 insertions, 1 deletions

diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index c0837024..f52968b0 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -45,6 +45,16 @@ QT_BEGIN_NAMESPACE
 static const int maxValidZoom = 30;
 static const QDateTime defaultTs = QDateTime::fromString(QStringLiteral("2016-06-01T00:00:00"), Qt::ISODate);
 
+static void setSSL(QGeoMapType &mapType, bool isHTTPS)
+{
+    QVariantMap metadata = mapType.metadata();
+    metadata["isHTTPS"] = isHTTPS;
+
+    mapType = QGeoMapType(mapType.style(), mapType.name(), mapType.description(), mapType.mobile(),
+                          mapType.night(), mapType.mapId(), mapType.pluginName(), mapType.cameraCapabilities(),
+                          metadata);
+}
+
 QGeoTileProviderOsm::QGeoTileProviderOsm(QNetworkAccessManager *nm,
                                          const QGeoMapType &mapType,
                                          const QVector<TileProvider *> &providers,
@@ -61,6 +71,9 @@ QGeoTileProviderOsm::QGeoTileProviderOsm(QNetworkAccessManager *nm,
     if (!m_provider || m_provider->isValid())
         m_status = Resolved;
 
+    if (m_provider && m_provider->isValid())
+        setSSL(m_mapType, m_provider->isHTTPS());
+
     connect(this, &QGeoTileProviderOsm::resolutionFinished, this, &QGeoTileProviderOsm::updateCameraCapabilities);
 }
 
@@ -237,7 +250,11 @@ void QGeoTileProviderOsm::updateCameraCapabilities()
     m_cameraCapabilities.setMaximumZoomLevel(maximumZoomLevel());
 
     m_mapType = QGeoMapType(m_mapType.style(), m_mapType.name(), m_mapType.description(), m_mapType.mobile(),
-                            m_mapType.night(), m_mapType.mapId(), m_mapType.pluginName(), m_cameraCapabilities);
+                            m_mapType.night(), m_mapType.mapId(), m_mapType.pluginName(), m_cameraCapabilities,
+                            m_mapType.metadata());
+
+    if (m_provider && m_provider->isValid())
+        setSSL(m_mapType, m_provider->isHTTPS());
 }
 
 void QGeoTileProviderOsm::addProvider(TileProvider *provider)
@@ -604,6 +621,11 @@ bool TileProvider::isHighDpi() const
     return m_highDpi;
 }
 
+bool TileProvider::isHTTPS() const
+{
+    return m_urlTemplate.startsWith(QStringLiteral("https"));
+}
+
 void TileProvider::setStyleCopyRight(const QString &copyright)
 {
     m_copyRightStyle = copyright;
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.h b/src/plugins/geoservices/osm/qgeotileproviderosm.h
index 54f8049d..ab4e2294 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.h
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.h
@@ -93,6 +93,7 @@ public:
     inline int maximumZoomLevel() const;
     inline const QDateTime &timestamp() const;
     inline bool isHighDpi() const;
+    inline bool isHTTPS() const;
     QUrl tileAddress(int x, int y, int z) const;
 
     // Optional properties, not needed to construct a provider