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

Conflicts:
	src/webengine/api/qquickwebengineview_p_p.h
	src/webengine/ui_delegates_manager.cpp
	src/webengine/ui_delegates_manager.h
	src/webenginewidgets/api/qwebenginepage_p.h

Change-Id: I8052de4d3b2e68a950832226f6f99e2aafca5505

1 files changed, 14 insertions, 3 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 72b651cf1..08976a291 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -44,6 +44,7 @@
 #include <QAuthenticator>
 #include <QClipboard>
 #include <QFileDialog>
+#include <QKeyEvent>
 #include <QIcon>
 #include <QInputDialog>
 #include <QLayout>
@@ -55,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace QtWebEngineCore;
+
 static QWebEnginePage::WebWindowType toWindowType(WebContentsAdapterClient::WindowOpenDisposition disposition)
 {
     switch (disposition) {
@@ -240,10 +243,14 @@ qreal QWebEnginePagePrivate::dpiScale() const
     return 1.0;
 }
 
-void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl)
+void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isErrorPage)
 {
-    Q_UNUSED(provisionalUrl)
+    Q_UNUSED(provisionalUrl);
     Q_Q(QWebEnginePage);
+
+    if (isErrorPage)
+        return;
+
     isLoading = true;
     Q_EMIT q->loadStarted();
     updateNavigationActions();
@@ -254,12 +261,16 @@ void QWebEnginePagePrivate::loadCommitted()
     updateNavigationActions();
 }
 
-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, int errorCode, const QString &errorDescription)
+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
 {
     Q_Q(QWebEnginePage);
     Q_UNUSED(url);
     Q_UNUSED(errorCode);
     Q_UNUSED(errorDescription);
+
+    if (isErrorPage)
+        return;
+
     isLoading = false;
     if (success)
         explicitUrl = QUrl();