From 800365f6faad962a4dd2e71173527d285a3f62b5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Wed, 22 Jun 2016 11:51:55 +0200
Subject: Switch to using QQuickWidget in WebEngineWidgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To support scenegraph-ng we need to switch away from QOpenGLWidget, to
something that will work with any QQuick backend.

Task-number: QTBUG-53283
Change-Id: I476a2c22e35a18cefc2824d5342bcff874c44d28
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 .../render_widget_host_view_qt_delegate_widget.h    | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 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 e263d4802..9759e77cd 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -43,19 +43,12 @@
 #include "render_widget_host_view_qt_delegate.h"
 #include "web_contents_adapter_client.h"
 
-#include <QSGAbstractRenderer>
-#include <QSGEngine>
-#include <QSGNode>
-
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-#include <QtWidgets/private/qopenglwidget_p.h>
-#else
-#include <QtWidgets/QOpenGLWidget>
-#endif
+#include <QQuickItem>
+#include <QQuickWidget>
 
 namespace QtWebEngineCore {
 
-class RenderWidgetHostViewQtDelegateWidget : public QOpenGLWidget, public RenderWidgetHostViewQtDelegate {
+class RenderWidgetHostViewQtDelegateWidget : public QQuickWidget, public RenderWidgetHostViewQtDelegate {
     Q_OBJECT
 public:
     RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = 0);
@@ -88,8 +81,6 @@ protected:
     void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
     void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
     void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
 
     QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
 
@@ -98,12 +89,8 @@ private slots:
 
 private:
     RenderWidgetHostViewQtDelegateClient *m_client;
-    // Put the root node first to make sure it gets destroyed after the SG renderer.
-    QScopedPointer<QSGRootNode> m_rootNode;
-    QScopedPointer<QSGEngine> m_sgEngine;
-    QScopedPointer<QSGAbstractRenderer> m_sgRenderer;
+    QScopedPointer<QQuickItem> m_rootItem;
     bool m_isPopup;
-    QColor m_clearColor;
     QList<QMetaObject::Connection> m_windowConnections;
 };
 
-- 
cgit v1.2.3