diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-04-06 17:21:16 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-04-20 13:02:34 +0000 |
| commit | 7d76c6b2cd8989f134f678789bba2f13ed019153 (patch) | |
| tree | 32d2e8b1cef5067bf389ca420c0f0698eba64051 /examples/webenginewidgets/simplebrowser/webpopupwindow.cpp | |
| parent | ddc4c40e2dcba81d36c9a4c445f1540b90403997 (diff) | |
SimpleBrowser: Use new QWebEnginePage::icon API
Change-Id: I38d16a57116517aee21f6f84c5fca82192cb1572
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/webpopupwindow.cpp')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/webpopupwindow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp b/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp index a3175e546..8146dcfb7 100644 --- a/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp +++ b/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp @@ -65,7 +65,7 @@ WebPopupWindow::WebPopupWindow(QWebEngineProfile *profile) connect(m_view, &WebView::titleChanged, this, &QWidget::setWindowTitle); connect(m_view, &WebView::urlChanged, this, &WebPopupWindow::setUrl); - connect(m_view, &WebView::iconChanged, this, &WebPopupWindow::handleIconChanged); + connect(m_view->page(), &WebPage::iconChanged, this, &WebPopupWindow::handleIconChanged); connect(m_view->page(), &WebPage::geometryChangeRequested, this, &WebPopupWindow::handleGeometryChangeRequested); connect(m_view->page(), &WebPage::windowCloseRequested, this, &QWidget::close); } @@ -91,5 +91,8 @@ void WebPopupWindow::handleGeometryChangeRequested(const QRect &newGeometry) void WebPopupWindow::handleIconChanged(const QIcon &icon) { - m_addressBar->setFavIcon(icon); + if (icon.isNull()) + m_addressBar->setFavIcon(QIcon(QStringLiteral(":defaulticon.png"))); + else + m_addressBar->setFavIcon(icon); } |