Fix opened webviews closing when opener closes

We apparently can't not rely on getting a QEvent::ParentAboutToChange
event before every QEvent::ParentChange event.

Change-Id: Ie55b51f8c75623bc4f1a943367fb0070078df55b
Fixes: QTBUG-71565
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 9 insertions, 13 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 7bbd85091..e735341cd 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -177,16 +177,15 @@ RenderWidgetHostViewQtDelegateWidget::~RenderWidgetHostViewQtDelegateWidget()
 
 void RenderWidgetHostViewQtDelegateWidget::connectRemoveParentBeforeParentDelete()
 {
-    if (QWidget *parent = parentWidget())
-        connect(parent, &QObject::destroyed,
-                this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
-}
-
-void RenderWidgetHostViewQtDelegateWidget::disconnectRemoveParentBeforeParentDelete()
-{
-    if (QWidget *parent = parentWidget())
-        disconnect(parent, &QObject::destroyed,
-                   this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
+    disconnect(m_parentDestroyedConnection);
+
+    if (QWidget *parent = parentWidget()) {
+        m_parentDestroyedConnection = connect(parent, &QObject::destroyed,
+                                              this,
+                                              &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
+    } else {
+        m_parentDestroyedConnection = QMetaObject::Connection();
+    }
 }
 
 void RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete()
@@ -417,9 +416,6 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
 
     // Track parent to make sure we don't get deleted.
     switch (event->type()) {
-    case QEvent::ParentAboutToChange:
-        disconnectRemoveParentBeforeParentDelete();
-        break;
     case QEvent::ParentChange:
         connectRemoveParentBeforeParentDelete();
         break;