diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-04-20 20:00:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-23 19:26:46 +0000 |
| commit | e63669cf8538ab1ae4845ba7579b5021b61329d3 (patch) | |
| tree | 5dca880965b37a74241904363df0a5188e1e1c8a | |
| parent | 381e14f7fe7448c38240be41b4098d2806ad5925 (diff) | |
Support setting page to nullptr to unset
Worked in 5.15, and now crashed. This patch returns 5.15 behavior.
Change-Id: Ib50dca96d9e90312cd2ee55aaf3205f5b848dd15
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit b76a7dd5eabc04c06494769ccae685cf581f52c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index a282df3e3..6a22a887e 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -663,7 +663,10 @@ void QWebEngineView::setPage(QWebEnginePage *newPage) disconnect(d->m_pageConnection); d->m_pageConnection = {}; } + QWebEngineViewPrivate::bindPageAndView(newPage, this); + if (!newPage) + return; d->m_pageConnection = connect(newPage, &QWebEnginePage::_q_aboutToDelete, this, [newPage]() { QWebEngineViewPrivate::bindPageAndView(newPage, nullptr); }); auto profile = newPage->profile(); |