From f1e16024b7d608e5d4dc2144d2c97eca73c951ef Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Fri, 10 Oct 2014 18:29:27 +0200 Subject: 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 --- src/core/web_engine_settings.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/web_engine_settings.cpp') 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)); -- cgit v1.2.3