Fix build with newer qtdeclarative

What was previous called QSGImageNode is now
QSGInternalImageNode

Task-number: QTBUG-54312
Change-Id: Iec286765bea5598d86932c81bfd122461a2e9884
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

8 files changed, 24 insertions, 9 deletions

diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index ad1aff6d4..8b635d912 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -539,7 +539,7 @@ void DelegatedFrameNode::commit(ChromiumCompositorData *chromiumCompositorData,
                     continue;
 
                 // Only QSGImageNode currently supports QSGLayer textures.
-                QSGImageNode *imageNode = apiDelegate->createImageNode();
+                QSGInternalImageNode *imageNode = apiDelegate->createImageNode();
                 imageNode->setTargetRect(toQt(quad->rect));
                 imageNode->setInnerTargetRect(toQt(quad->rect));
                 imageNode->setTexture(layer);
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
index ce6ec730a..151f49bf6 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -49,13 +49,20 @@ QT_BEGIN_NAMESPACE
 class QCursor;
 class QEvent;
 class QPainter;
-class QSGImageNode;
 class QSGLayer;
 class QSGNode;
 class QSGTexture;
 class QVariant;
 class QWindow;
 class QInputMethodEvent;
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 8, 0))
+class QSGImageNode;
+typedef QSGImageNode QSGInternalImageNode;
+#else
+class QSGInternalImageNode;
+#endif
+
 QT_END_NAMESPACE
 
 namespace QtWebEngineCore {
@@ -92,7 +99,7 @@ public:
     virtual QWindow* window() const = 0;
     virtual QSGTexture *createTextureFromImage(const QImage &) = 0;
     virtual QSGLayer *createLayer() = 0;
-    virtual QSGImageNode *createImageNode() = 0;
+    virtual QSGInternalImageNode *createImageNode() = 0;
     virtual void update() = 0;
     virtual void updateCursor(const QCursor &) = 0;
     virtual void resize(int width, int height) = 0;
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 5e39cc2b3..1f52d9896 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -177,10 +177,14 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuick::createLayer()
     return renderContext->sceneGraphContext()->createLayer(renderContext);
 }
 
-QSGImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode()
+QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode()
 {
     QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+    return renderContext->sceneGraphContext()->createInternalImageNode();
+#else
     return renderContext->sceneGraphContext()->createImageNode();
+#endif
 }
 
 void RenderWidgetHostViewQtDelegateQuick::update()
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index 66bc63732..b0bd387d0 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -66,7 +66,7 @@ public:
     virtual QWindow* window() const Q_DECL_OVERRIDE;
     virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
     virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGImageNode *createImageNode() Q_DECL_OVERRIDE;
+    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
     virtual void update() Q_DECL_OVERRIDE;
     virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
     virtual void resize(int width, int height) Q_DECL_OVERRIDE;
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
index 64839c9fa..158d13498 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
@@ -111,7 +111,7 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuickWindow::createLayer()
     return m_realDelegate->createLayer();
 }
 
-QSGImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createImageNode()
+QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createImageNode()
 {
     return m_realDelegate->createImageNode();
 }
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
index 699b4ce9e..56045abb1 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
@@ -69,7 +69,7 @@ public:
     virtual QWindow* window() const Q_DECL_OVERRIDE;
     virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
     virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGImageNode *createImageNode() Q_DECL_OVERRIDE;
+    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
     virtual void update() Q_DECL_OVERRIDE;
     virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
     virtual void resize(int width, int height) Q_DECL_OVERRIDE;
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 99621b602..3dea53b96 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -200,9 +200,13 @@ QSGLayer *RenderWidgetHostViewQtDelegateWidget::createLayer()
     return enginePrivate->sgContext->createLayer(enginePrivate->sgRenderContext.data());
 }
 
-QSGImageNode *RenderWidgetHostViewQtDelegateWidget::createImageNode()
+QSGInternalImageNode *RenderWidgetHostViewQtDelegateWidget::createImageNode()
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+    return QSGEnginePrivate::get(m_sgEngine.data())->sgContext->createInternalImageNode();
+#else
     return QSGEnginePrivate::get(m_sgEngine.data())->sgContext->createImageNode();
+#endif
 }
 
 void RenderWidgetHostViewQtDelegateWidget::update()
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 9fd0cdc48..e263d4802 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -74,7 +74,7 @@ public:
     virtual QWindow* window() const Q_DECL_OVERRIDE;
     virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
     virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGImageNode *createImageNode() Q_DECL_OVERRIDE;
+    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
     virtual void update() Q_DECL_OVERRIDE;
     virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
     virtual void resize(int width, int height) Q_DECL_OVERRIDE;