From a374588604374d6de8bdec2ced8f91eb2c36e48a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 12 Dec 2023 09:34:35 +0100
Subject: [PATCH] QmlDesigner/editor3d: Fix build with Qt 6.7

rendercontextcore is now a public header

(qtquick3d 89ca37fb914c6539334df62b38ea8cee80dade9d)

Fixes: QTCREATORBUG-30052
Change-Id: I58ac699ed81e958c0a0fccd14385b3359be1fb08
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp | 7 ++++++-
 .../qml2puppet/editor3d/selectionboxgeometry.cpp           | 7 ++++++-
 .../qml2puppet/instances/qt5nodeinstanceserver.cpp         | 5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
index f1b4b795e47..250629107a4 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -16,7 +16,6 @@
 #include <QtQuick3D/private/qquick3dviewport_p.h>
 #include <QtQuick3D/private/qquick3ddefaultmaterial_p.h>
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
-#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrenderbuffermanager_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
 #include <QtQuick3DUtils/private/qssgbounds3_p.h>
@@ -25,6 +24,12 @@
 #include <QtQuick/qquickitem.h>
 #include <QtCore/qmath.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
+
 #ifdef QUICK3D_PARTICLES_MODULE
 #include <QtQuick3DParticles/private/qquick3dparticlemodelshape_p.h>
 #include <QtQuick3DParticles/private/qquick3dparticleemitter_p.h>
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
index 64c3c25a2ab..14efba3b9e0 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
@@ -6,7 +6,6 @@
 #include "selectionboxgeometry.h"
 
 #include <QtQuick3DRuntimeRender/private/qssgrendermodel_p.h>
-#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
 #include <QtQuick3DRuntimeRender/private/qssgrenderbuffermanager_p.h>
 #include <QtQuick3D/private/qquick3dmodel_p.h>
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
@@ -14,6 +13,12 @@
 #include <QtQuick/qquickwindow.h>
 #include <QtCore/qvector.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
+
 #include <limits>
 
 namespace QmlDesigner {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 2f905d21cf7..4c163bf69ff 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -46,7 +46,12 @@
 #define USE_PIPELINE_CACHE 1
 
 #if defined(QUICK3D_MODULE) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 2)
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
 #include <QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h>
+#else
+#include <QtQuick3DRuntimeRender/private/qssgrendershadercache_p.h>
+#include <QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h>
+#endif
 #include <QtQuick3D/private/qquick3dscenemanager_p.h>
 #define USE_SHADER_CACHE 1
 #endif