diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-04-12 11:33:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-17 17:05:18 +0000 |
| commit | 96fb3a30457c8925431b67c0f35abb2833b7fb7c (patch) | |
| tree | 0fa0f65a13b567136d1f5322d8f959209b881b76 /src/webenginewidgets/api/qwebengineview.cpp | |
| parent | 9773111d686a96d694685fcb155a1965b0b6107f (diff) | |
| download | qtwebengine-96fb3a30457c8925431b67c0f35abb2833b7fb7c.tar.gz | |
Fix QWebEngineView::setPage not deleting old page
Also fix QWebEnginePage::setView not deleting old page
Also fix wrong page being deleted if it's parented to the view.
Fixes: QTBUG-75131
Fixes: QTBUG-75175
Change-Id: Ie4dfb15b3182de7aa3a94cddcac54ea40a86121b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets/api/qwebengineview.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 966b30100..381f1385c 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -126,6 +126,7 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje QWebEngineViewPrivate::QWebEngineViewPrivate() : page(0) , m_dragEntered(false) + , m_ownsPage(false) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installFactory(&webAccessibleFactory); @@ -176,6 +177,7 @@ QWebEnginePage* QWebEngineView::page() const if (!d->page) { QWebEngineView *that = const_cast<QWebEngineView*>(this); that->setPage(new QWebEnginePage(that)); + d->m_ownsPage = true; } return d->page; } |