diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-06-19 11:17:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-04 18:41:41 +0200 |
| commit | 881339e9d9054c46f2621119246de7a13c83761a (patch) | |
| tree | 77db7d7188c4ac61cab939c2ccd7a9610d4a01f4 /src/core/api | |
| parent | 4d67b9f639114ddec0521980495ba27921800e39 (diff) | |
Replace FaviconManager with Chromium's Favicon Component
Task-number: QTBUG-51184
Change-Id: Ie050cb23f2c86841a66ec384bfbcdf0713cffa7c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qwebenginepage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 6e2b37514..64b4f4d99 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -44,7 +44,6 @@ #include "authentication_dialog_controller.h" #include "profile_adapter.h" #include "color_chooser_controller.h" -#include "favicon_manager.h" #include "find_text_helper.h" #include "file_picker_controller.h" #include "javascript_dialog_controller.h" @@ -255,7 +254,7 @@ void QWebEnginePagePrivate::iconChanged(const QUrl &url) return; iconUrl = url; Q_EMIT q->iconUrlChanged(iconUrl); - Q_EMIT q->iconChanged(adapter->faviconManager()->getIcon()); + Q_EMIT q->iconChanged(iconUrl.isEmpty() ? QIcon() : adapter->icon()); } void QWebEnginePagePrivate::loadProgressChanged(int progress) @@ -1980,7 +1979,7 @@ QIcon QWebEnginePage::icon() const if (d->iconUrl.isEmpty() || !d->adapter->isInitialized()) return QIcon(); - return d->adapter->faviconManager()->getIcon(); + return d->adapter->icon(); } qreal QWebEnginePage::zoomFactor() const |