diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-07 18:21:52 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-06 19:07:45 +0200 |
commit | fffb6233a366a92336aeed690cae0b704358511d (patch) | |
tree | d7ee82c5dfc696151aba1e2f134c1b350f15de1c /src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | |
parent | 83a6c1b92f38b4b0bdb3f90d67be7bb1e4caef7a (diff) |
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>
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 | 12 |
1 files changed, 5 insertions, 7 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 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; }; |