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, 15 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index aa6290aa8..7f36bad5e 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -140,6 +140,12 @@ bool QQuickWebEngineSettings::hyperlinkAuditingEnabled() const
     return d->coreSettings->testAttribute(WebEngineSettings::HyperlinkAuditingEnabled);
 }
 
+bool QQuickWebEngineSettings::errorPageEnabled() const
+{
+    Q_D(const QQuickWebEngineSettings);
+    return d->coreSettings->testAttribute(WebEngineSettings::ErrorPageEnabled);
+}
+
 QString QQuickWebEngineSettings::defaultTextEncoding() const
 {
     Q_D(const QQuickWebEngineSettings);
@@ -239,6 +245,15 @@ void QQuickWebEngineSettings::setHyperlinkAuditingEnabled(bool on)
         Q_EMIT hyperlinkAuditingEnabledChanged(on);
 }
 
+void QQuickWebEngineSettings::setErrorPageEnabled(bool on)
+{
+    Q_D(QQuickWebEngineSettings);
+    bool wasOn = d->coreSettings->testAttribute(WebEngineSettings::ErrorPageEnabled);
+    d->coreSettings->setAttribute(WebEngineSettings::ErrorPageEnabled, on);
+    if (wasOn ^ on)
+        Q_EMIT errorPageEnabledChanged(on);
+}
+
 void QQuickWebEngineSettings::setDefaultTextEncoding(QString encoding)
 {
     Q_D(QQuickWebEngineSettings);