From a7a7eb4c525a4fb78a3f0f1205262b147304261d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 13 Sep 2016 11:57:31 +0200 Subject: Expose allow-running-insecure-contents as a setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AllowRunningInsecureContent was added as a setting in core to enable parsing a chromium command-line argument. This patch forwards the setting to our API layers. [ChangeLog][Settings] Added setting to allow secure content to run insecure content. Task-number: QTBUG-54902 Change-Id: I4e005be1a29905ccf931fabe9ccb308b7d947c62 Reviewed-by: Michael Brüning --- src/webenginewidgets/api/qwebenginesettings.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/webenginewidgets/api/qwebenginesettings.cpp') diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index f14aa9352..50002e3e6 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -93,6 +93,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::FocusOnNavigationEnabled; case QWebEngineSettings::PrintElementBackgrounds: return WebEngineSettings::PrintElementBackgrounds; + case QWebEngineSettings::AllowRunningInsecureContent: + return WebEngineSettings::AllowRunningInsecureContent; default: return WebEngineSettings::UnsupportedInCoreSettings; -- cgit v1.2.3