From 6de87734c623d0b6ecfea0440ee396a00d59d74f Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 8 Apr 2014 18:32:44 +0200
Subject: Widgets: Fix a crash on shutdown

The root node doesn't clean itself up immediately inside the SG
renderer when destroyed. Just avoid the issue by destroying the
renderer first.

Change-Id: I833b7fdc411f149631fd13d1c1fca515b9402bf4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h')

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;
 };
-- 
cgit v1.2.3