Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

1 files changed, 2 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp
index 9ade311fc..729a09f56 100644
--- a/src/webenginewidgets/api/qwebenginesettings.cpp
+++ b/src/webenginewidgets/api/qwebenginesettings.cpp
@@ -67,6 +67,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web
         return WebEngineSettings::HyperlinkAuditingEnabled;
     case QWebEngineSettings::ScrollAnimatorEnabled:
         return WebEngineSettings::ScrollAnimatorEnabled;
+    case QWebEngineSettings::ErrorPageEnabled:
+        return WebEngineSettings::ErrorPageEnabled;
     default:
         return WebEngineSettings::UnsupportedInCoreSettings;
     }