diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-13 15:04:07 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-13 15:04:07 +0100 |
| commit | befa6cc99722ccef6635071cc35463f8429aef29 (patch) | |
| tree | d1a1ae305e33f67b1cb3e2d30a5726c0e06a37f8 /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | |
| parent | 7db70f1e85f628f78df84eb195473fb315e812fe (diff) | |
| parent | 4d6de2ba36ff4fe17b0e1c8ee7de4f63e2778c9e (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I05a9474efe6b00cc18ad6e33e19a1eb1cbbe8afe
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index e78a9b119..e23f13d86 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -102,7 +102,6 @@ protected: private slots: void onWindowPosChanged(); void connectRemoveParentBeforeParentDelete(); - void disconnectRemoveParentBeforeParentDelete(); void removeParentBeforeParentDelete(); private: @@ -116,6 +115,7 @@ private: QPoint m_lastGlobalPos; QList<QMetaObject::Connection> m_windowConnections; QWebEnginePage *m_page = nullptr; + QMetaObject::Connection m_parentDestroyedConnection; }; } // namespace QtWebEngineCore |