Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

1 files changed, 17 insertions, 0 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index f10dd7500..2aca88d6a 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -371,3 +371,20 @@ void ContentBrowserClientQt::AllowCertificateError(int render_process_id, int re
     QExplicitlySharedDataPointer<CertificateErrorController> errorController(new CertificateErrorController(new CertificateErrorControllerPrivate(cert_error, ssl_info, request_url, resource_type, overridable, strict_enforcement, callback)));
     contentsDelegate->allowCertificateError(errorController);
 }
+
+void ContentBrowserClientQt::RequestGeolocationPermission(content::WebContents *webContents,
+                                                          int bridge_id,
+                                                          const GURL &requesting_frame,
+                                                          bool user_gesture,
+                                                          base::Callback<void(bool)> result_callback,
+                                                          base::Closure *cancel_callback)
+{
+    Q_UNUSED(webContents);
+    Q_UNUSED(bridge_id);
+    Q_UNUSED(requesting_frame);
+    Q_UNUSED(user_gesture);
+    Q_UNUSED(cancel_callback);
+
+    // TODO: Add geolocation support
+    result_callback.Run(false);
+}