Add AllowGeolocationOnInsecureOrigins setting

This provides a way to restore earlier QtWebEngine behavior where
geolocation was possible from all origins.

[ChangeLog][Settings] Added setting to again allow insecure origins
to request geolocation.

Change-Id: I043fb7a36a56fa5acc1740d52a50b9d7ff49a2c5
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 23 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 09bf2708e..ac01d9cd6 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -347,6 +347,21 @@ bool QQuickWebEngineSettings::allowRunningInsecureContent() const
 }
 
 /*!
+  \qmlproperty bool WebEngineSettings::allowGeolocationOnInsecureOrigins
+  \since QtWebEngine 1.5
+
+  Since Qt 5.7, only secure origins such as HTTPS have been able to request
+  Geolocation features. This provides an override to allow non secure
+  origins to access Geolocation again.
+
+  Disabled by default.
+*/
+bool QQuickWebEngineSettings::allowGeolocationOnInsecureOrigins() const
+{
+    return d_ptr->testAttribute(WebEngineSettings::AllowGeolocationOnInsecureOrigins);
+}
+
+/*!
     \qmlproperty string WebEngineSettings::defaultTextEncoding
     \since QtWebEngine 1.2
 
@@ -540,6 +555,14 @@ void QQuickWebEngineSettings::setAllowRunningInsecureContent(bool on)
         Q_EMIT allowRunningInsecureContentChanged();
 }
 
+void QQuickWebEngineSettings::setAllowGeolocationOnInsecureOrigins(bool on)
+{
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::AllowGeolocationOnInsecureOrigins);
+    d_ptr->setAttribute(WebEngineSettings::AllowGeolocationOnInsecureOrigins, on);
+    if (wasOn != on)
+        Q_EMIT allowGeolocationOnInsecureOriginsChanged();
+}
+
 void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings)
 {
     d_ptr->setParentSettings(parentSettings->d_ptr.data());