From fffb6233a366a92336aeed690cae0b704358511d Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Mon, 7 Jul 2014 18:21:52 +0200
Subject: Use QSGEngine instead of the private QSGRenderContext

QSGEngine was added in Qt 5.4 to allow using the scene graph
without QQuickWindow. Use it for our FBO as well as for the
QOpenGLWidget rendering.

Change-Id: If4665d4f33c9dad69d2d4269309163bb5ffbd8e3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 .../render_widget_host_view_qt_delegate_widget.h             | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(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 03827adfe..68553b8e8 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -52,9 +52,8 @@
 #endif
 
 QT_BEGIN_NAMESPACE
-class QSGContext;
-class QSGRenderContext;
-class QSGRenderer;
+class QSGAbstractRenderer;
+class QSGEngine;
 class QSGRootNode;
 class QWindow;
 QT_END_NAMESPACE
@@ -92,10 +91,9 @@ 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<QSGRenderer> sgRenderer;
+    QScopedPointer<QSGRootNode> m_rootNode;
+    QScopedPointer<QSGEngine> m_sgEngine;
+    QScopedPointer<QSGAbstractRenderer> m_sgRenderer;
     bool m_isPopup;
 };
 
-- 
cgit v1.2.3