diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-10-10 18:29:27 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-10-14 12:06:10 +0200 |
| commit | f1e16024b7d608e5d4dc2144d2c97eca73c951ef (patch) | |
| tree | b9ded287ec69b49a3eede526628481a9af5d6f47 /src/core/web_engine_settings.cpp | |
| parent | 38e68ab97b6de2f66bd367785d71831d9a154687 (diff) | |
Add setting ErrorPageEnabled
This is required so that embedders can implement custom error pages,
and is also needed for tests, where error-page loading has side-effects
on subsequent page loads.
Change-Id: I5ae276a58864a2fa9d7b608bea3340b482a92f4e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 03f746f41..9b070d3b2 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -213,6 +213,7 @@ void WebEngineSettings::initDefaults() m_attributes.insert(LocalContentCanAccessFileUrls, true); m_attributes.insert(HyperlinkAuditingEnabled, false); m_attributes.insert(ScrollAnimatorEnabled, false); + m_attributes.insert(ErrorPageEnabled, true); // Default fonts QFont defaultFont; @@ -276,6 +277,7 @@ void WebEngineSettings::applySettingsToWebPreferences(WebPreferences *prefs) prefs->allow_file_access_from_file_urls = testAttribute(LocalContentCanAccessFileUrls); prefs->hyperlink_auditing_enabled = testAttribute(HyperlinkAuditingEnabled); prefs->enable_scroll_animator = testAttribute(ScrollAnimatorEnabled); + prefs->enable_error_page = testAttribute(ErrorPageEnabled); // Fonts settings. prefs->standard_font_family_map[webkit_glue::kCommonScript] = toString16(fontFamily(StandardFont)); |