diff options
| author | Viktor Engelmann <viktor.engelmann@qt.io> | 2017-07-03 15:51:51 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 18:06:55 +0000 |
| commit | 49c0ce8403e5caeb864f66553f122c68a7c975fb (patch) | |
| tree | a3b4c1f89754c316fe1fb5cce4392dd05f1db4e7 /src/core/web_engine_settings.cpp | |
| parent | 8365186b3fdc2f1eca7e015147688d23bfdf81e9 (diff) | |
Add Setting to allow passing unknown URL schemes to QDesktopServices
A new enum UnknownUrlSchemePolicy was added to WebEngineSettings,
QWebEngineSettings and QQuickWebEngineSettings.
WebContentsDelegate now has a new attribute of that type, which can
be read and written through the public APIs
Q(Quick)WebEngineSettings::unknownUrlSchemeNavigationPolicy and
Q(Quick)WebEngineSettings::setUnknownUrlSchemeNavigationPolicy.
This way, one can control, whether URLs with unknown schemes are passed
to QDesktopServices. WebContentsAdapterClient::navigationRequested is
called on these requests, so this allows more fine-grained control
over the schemes and origins, that are allowed.
Task-number: QTBUG-58627
Change-Id: Ie81d9503456d63ea1ed5606483254acf437cd8f7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 4c944892a..7b9c1225d 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -110,6 +110,7 @@ WebEngineSettings::WebEngineSettings(WebEngineSettings *_parentSettings) : m_adapter(0) , m_batchTimer(new BatchTimer(this)) , parentSettings(_parentSettings) + , m_unknownUrlSchemePolicy(WebEngineSettings::InheritedUnknownUrlSchemePolicy) { if (parentSettings) parentSettings->childSettings.insert(this); @@ -212,6 +213,22 @@ QString WebEngineSettings::defaultTextEncoding() const return m_defaultEncoding.isEmpty()? parentSettings->defaultTextEncoding() : m_defaultEncoding; } +void WebEngineSettings::setUnknownUrlSchemePolicy(WebEngineSettings::UnknownUrlSchemePolicy policy) +{ + m_unknownUrlSchemePolicy = policy; +} + +WebEngineSettings::UnknownUrlSchemePolicy WebEngineSettings::unknownUrlSchemePolicy() const +{ + // value InheritedUnknownUrlSchemePolicy means it is taken from parent, if possible. If there + // is no parent, then AllowUnknownUrlSchemesFromUserInteraction (the default behavior) is used. + if (m_unknownUrlSchemePolicy != InheritedUnknownUrlSchemePolicy) + return m_unknownUrlSchemePolicy; + if (parentSettings) + return parentSettings->unknownUrlSchemePolicy(); + return AllowUnknownUrlSchemesFromUserInteraction; +} + void WebEngineSettings::initDefaults() { if (s_defaultAttributes.isEmpty()) { @@ -284,6 +301,7 @@ void WebEngineSettings::initDefaults() } m_defaultEncoding = QStringLiteral("ISO-8859-1"); + m_unknownUrlSchemePolicy = InheritedUnknownUrlSchemePolicy; } void WebEngineSettings::scheduleApply() |