From 9651da8fdedb3533c5f95fa7a8028a017e508d07 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 8 Feb 2021 13:18:39 +0100
Subject: Remove more leftovers of the old compositor

Also removes another private dependency

Change-Id: Ie0a671c66f9aa49e7001c44e69bf94e11ab058a5
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
---
 .../render_widget_host_view_qt_delegate_quick.cpp    | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')

diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index e1ae8863e..e729f7532 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -41,13 +41,16 @@
 
 #include "qquickwebengineview_p.h"
 #include "qquickwebengineview_p_p.h"
+
 #include <QGuiApplication>
-#include <QQuickPaintedItem>
 #include <QQuickWindow>
-#include <QSurfaceFormat>
 #include <QVariant>
 #include <QWindow>
-#include <QtQuick/private/qquickwindow_p.h>
+
+#if defined(Q_OS_MACOS) && QT_CONFIG(opengl)
+#include <QOpenGLContext>
+#include <QSurfaceFormat>
+#endif
 
 namespace QtWebEngineCore {
 
@@ -167,22 +170,11 @@ QSGTexture *RenderWidgetHostViewQtDelegateQuick::createTextureFromImage(const QI
     return QQuickItem::window()->createTextureFromImage(image, QQuickWindow::TextureCanUseAtlas);
 }
 
-QSGLayer *RenderWidgetHostViewQtDelegateQuick::createLayer()
-{
-    QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context;
-    return renderContext->sceneGraphContext()->createLayer(renderContext);
-}
-
 QSGImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode()
 {
     return QQuickItem::window()->createImageNode();
 }
 
-QSGRectangleNode *RenderWidgetHostViewQtDelegateQuick::createRectangleNode()
-{
-    return QQuickItem::window()->createRectangleNode();
-}
-
 void RenderWidgetHostViewQtDelegateQuick::update()
 {
     QQuickItem::update();
-- 
cgit v1.2.3