summaryrefslogtreecommitdiff
path: root/src/webenginewidgets/api/qwebenginepage.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-30 10:39:42 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-30 10:40:26 +0200
commit4181db05fc8f1c96d0bbf2e88a64e6d3bb11c6cf (patch)
treef4f9127216f92102f3420949f82e3186fee15e54 /src/webenginewidgets/api/qwebenginepage.cpp
parentb546cea1b5ba6721bf7fcb687c6c069d4442ba34 (diff)
parent26ac59af2306b4f6f83e791bb3e828b9f7b1a721 (diff)
downloadqtwebengine-4181db05fc8f1c96d0bbf2e88a64e6d3bb11c6cf.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 9c6749f39..4c0a7a21f 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -715,6 +715,13 @@ void QWebEnginePagePrivate::bindPageAndView(QWebEnginePage *page, QWebEngineView
view->d_func()->pageChanged(oldPage, page);
if (oldWidget != widget)
view->d_func()->widgetChanged(oldWidget, widget);
+
+ // At this point m_ownsPage should still refer to oldPage,
+ // it is only set for the new page after binding.
+ if (view->d_func()->m_ownsPage) {
+ delete oldPage;
+ view->d_func()->m_ownsPage = false;
+ }
}
}