diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-11 14:50:14 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-12 15:27:56 +0000 |
| commit | a0eaab75700ed928a610b855d5ea8e7bc3de7fda (patch) | |
| tree | 9626eeca40f8c395715cd5b2bb1926fc1df00acf /src | |
| parent | 835b24055cfbc953fd4c844d264e7fbc8550d575 (diff) | |
Fix iconUrl getter and changed signal
We should only emit iconUrlChanged when iconUrl changes, and the return
value of iconUrl should match the value of the last emitted change.
Change-Id: I70f4d6a11b96d83278dddc4d85e1c78ca82bf5cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 7 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 1 |
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]; |