Fix iconChanged signal in Quick API

Do not emit iconChanged signal twice if icon url does not change.
This fix implements the same behavior for icon handling in Quick as in
the Widget API.

Change-Id: I9fcc27c9cec3cbef74fb0a71026065e359a5cbc3
Task-number: QTBUG-51179
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index f1bd817b6..914b602ce 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -401,7 +401,9 @@ void QQuickWebEngineViewPrivate::urlChanged(const QUrl &url)
 void QQuickWebEngineViewPrivate::iconChanged(const QUrl &url)
 {
     Q_Q(QQuickWebEngineView);
-    icon = url;
+    if (iconUrl == url)
+        return;
+    iconUrl = url;
     Q_EMIT q->iconChanged();
 }
 
@@ -846,7 +848,7 @@ void QQuickWebEngineView::setUrl(const QUrl& url)
 QUrl QQuickWebEngineView::icon() const
 {
     Q_D(const QQuickWebEngineView);
-    return d->icon;
+    return d->iconUrl;
 }
 
 void QQuickWebEngineView::loadHtml(const QString &html, const QUrl &baseUrl)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index e4313a4bd..29fa9e881 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -209,7 +209,7 @@ public:
     QQmlComponent *contextMenuExtraItems;
     QtWebEngineCore::WebEngineContextMenuData contextMenuData;
     QUrl explicitUrl;
-    QUrl icon;
+    QUrl iconUrl;
     int loadProgress;
     bool m_fullscreenMode;
     bool isLoading;