diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-13 11:57:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-22 15:29:27 +0000 |
| commit | a7a7eb4c525a4fb78a3f0f1205262b147304261d (patch) | |
| tree | f1e89a5ab3574777766c6151e3a28680aa57b202 /src/webenginewidgets | |
| parent | b04131f375a64204be962e7b92c88a3ecaf892c5 (diff) | |
Expose allow-running-insecure-contents as a setting
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 <michael.bruning@qt.io>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
3 files changed, 9 insertions, 1 deletions
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; diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 23a1d5c99..e3fb83ff5 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -87,7 +87,8 @@ public: AutoLoadIconsForPage, TouchIconsEnabled, FocusOnNavigationEnabled, - PrintElementBackgrounds + PrintElementBackgrounds, + AllowRunningInsecureContent }; enum FontSize { diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 955f6d80b..69bac36c8 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -155,6 +155,11 @@ \value PrintElementBackgrounds Turns on printing of CSS backgrounds when printing a web page. Enabled by default. (Added in Qt 5.8) + \value AllowRunningInsecureContent + By default, HTTPS pages cannot run JavaScript, CSS, plugins or + web-sockets from HTTP URLs. This provides an override to get + the old insecure behavior. + Disabled by default. (Added in Qt 5.8) */ /*! |