diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-10-21 18:38:10 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-24 09:44:52 +0100 |
| commit | e7d3d03a7540c2fa5ac1ba88eddec6135c4ab9ab (patch) | |
| tree | e6aff83c117d277107def6d9251b9ab7db6976fa /src/webenginewidgets | |
| parent | bd9c21e493a4d8337930ae9c722753d5b1188840 (diff) | |
Move default notification presenter setter to view
Default notification presenter depends on qsystemtryicon,
so it depends on widgets, move setter when page is set
on view.
Change-Id: I379b083fe66a4b44e4b92e01a7e5270837fd645c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 26e921773..cc8e00796 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -41,7 +41,6 @@ #include "qwebenginepage_p.h" #include "qwebenginedownloadrequest_p.h" -#include "qwebenginenotificationpresenter_p.h" #include "authentication_dialog_controller.h" #include "profile_adapter.h" #include "color_chooser_controller.h" @@ -142,8 +141,6 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) }); profile->d_ptr->addWebContentsAdapterClient(this); - if (!profile->notificationPresenter()) - profile->setNotificationPresenter(&defaultNotificationPresenter); } QWebEnginePagePrivate::~QWebEnginePagePrivate() diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 5e8d4559c..934991cbe 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -41,9 +41,11 @@ #include "qwebengineview_p.h" #include "qwebenginepage_p.h" +#include "qwebengineprofile.h" #include "render_widget_host_view_qt_delegate_widget.h" #include "web_contents_adapter.h" #include "file_picker_controller.h" +#include "qwebenginenotificationpresenter_p.h" #include "color_chooser_controller.h" #include <QStandardPaths> #if QT_CONFIG(action) @@ -487,6 +489,9 @@ void QWebEngineView::setPage(QWebEnginePage *newPage) QWebEngineViewPrivate::bindPageAndView(newPage, this); connect(newPage, &QWebEnginePage::_q_aboutToDelete, this, [newPage]() { QWebEngineViewPrivate::bindPageAndView(newPage, nullptr); }); + auto profile = newPage->profile(); + if (!profile->notificationPresenter()) + profile->setNotificationPresenter(&defaultNotificationPresenter); } void QWebEngineView::load(const QUrl& url) |