Merge dev into 5.7

Change-Id: I43d4811120b551ae9c2619dedb2099b7e7796660

2 files changed, 6 insertions, 2 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index eecd40708..13dee09f4 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -146,7 +146,10 @@ void QWebEnginePagePrivate::urlChanged(const QUrl &url)
 void QWebEnginePagePrivate::iconChanged(const QUrl &url)
 {
     Q_Q(QWebEnginePage);
-    Q_EMIT q->iconUrlChanged(url);
+    if (iconUrl == url)
+        return;
+    iconUrl = url;
+    Q_EMIT q->iconUrlChanged(iconUrl);
 }
 
 void QWebEnginePagePrivate::loadProgressChanged(int progress)
@@ -1452,7 +1455,7 @@ QUrl QWebEnginePage::requestedUrl() const
 QUrl QWebEnginePage::iconUrl() const
 {
     Q_D(const QWebEnginePage);
-    return d->adapter->iconUrl();
+    return d->iconUrl;
 }
 
 qreal QWebEnginePage::zoomFactor() const
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index ce769169e..6d4b857eb 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -163,6 +163,7 @@ public:
     bool fullscreenMode;
     QWebChannel *webChannel;
     unsigned int webChannelWorldId;
+    QUrl iconUrl;
 
     mutable QtWebEngineCore::CallbackDirectory m_callbacks;
     mutable QAction *actions[QWebEnginePage::WebActionCount];