Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

1 files changed, 10 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index eecd40708..a45139ead 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -213,13 +213,21 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isE
     Q_UNUSED(errorCode);
     Q_UNUSED(errorDescription);
 
-    if (isErrorPage)
+    if (isErrorPage) {
+        Q_ASSERT(settings->testAttribute(QWebEngineSettings::ErrorPageEnabled));
+        Q_ASSERT(success);
+        Q_EMIT q->loadFinished(false);
         return;
+    }
 
     isLoading = false;
     if (success)
         explicitUrl = QUrl();
-    Q_EMIT q->loadFinished(success);
+    // Delay notifying failure until the error-page is done loading.
+    // Error-pages are not loaded on failures due to abort.
+    if (success || errorCode == -3 /* ERR_ABORTED*/ || !settings->testAttribute(QWebEngineSettings::ErrorPageEnabled)) {
+        Q_EMIT q->loadFinished(success);
+    }
     updateNavigationActions();
 }