diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 3 |
2 files changed, 3 insertions, 2 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 19f7272be..7c012e54c 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -53,9 +53,9 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent) : QOpenGLWidget(parent) , m_client(client) + , rootNode(new QSGRootNode) , sgContext(QSGContext::createDefaultContext()) , sgRenderContext(new QSGRenderContext(sgContext.data())) - , rootNode(new QSGRootNode) , m_isPopup(false) { setFocusPolicy(Qt::ClickFocus); 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 7c3492e17..f7b83e5f5 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -86,9 +86,10 @@ protected: private: RenderWidgetHostViewQtDelegateClient *m_client; + // Put the root node first to make sure it gets destroyed after the SG renderer. + QScopedPointer<QSGRootNode> rootNode; QScopedPointer<QSGContext> sgContext; QScopedPointer<QSGRenderContext> sgRenderContext; - QScopedPointer<QSGRootNode> rootNode; QScopedPointer<QSGRenderer> sgRenderer; bool m_isPopup; }; |