summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-04-20 20:00:44 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-04-22 17:15:50 +0200
commitb76a7dd5eabc04c06494769ccae685cf581f52c4 (patch)
treecec607e4180b3ff30759dd521a109be915182f0a /src/webenginewidgets/api
parenta6efb817b3596131f1885d8f7b2d4d760141b169 (diff)
Support setting page to nullptr to unset
Worked in 5.15, and now crashed. This patch returns 5.15 behavior. Pick-to: 6.3 6.2 Change-Id: Ib50dca96d9e90312cd2ee55aaf3205f5b848dd15 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/webenginewidgets/api')
-rw-r--r--src/webenginewidgets/api/qwebengineview.cpp3
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();