1 files changed, 18 insertions, 11 deletions
diff --git a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt
index c38c09bbf..6f6f637fe 100644
--- a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt
+++ b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt
@@ -1,15 +1,25 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 project(Qt3DExtras)
 
 set(Qt3DExtras_SRC
 ${Qt3DExtras_GEN_DIR}/qt3dextras_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_inputstate_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractspritesheet_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qconegeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qconegeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qconemesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidgeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidgeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidmesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindergeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindergeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindermesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusemapmaterial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmapmaterial_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmaterial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextgeometry_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextmesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qfirstpersoncameracontroller_wrapper.cpp
@@ -25,29 +35,24 @@ ${Qt3DExtras_GEN_DIR}/qt3dextras_qpervertexcolormaterial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qphongmaterial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qphongalphamaterial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qplanegeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qplanegeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qplanemesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qskyboxentity_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qspheregeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qspheregeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qspheremesh_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qspritegrid_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheet_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheetitem_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qtext2dentity_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qtexturematerial_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusgeometry_wrapper.cpp
+${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusgeometryview_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusmesh_wrapper.cpp
 ${Qt3DExtras_GEN_DIR}/qt3dextras_qt3dwindow_wrapper.cpp
 # module is always needed
 ${Qt3DExtras_GEN_DIR}/qt3dextras_module_wrapper.cpp)
 
-if (Qt${QT_MAJOR_VERSION}3DExtras_VERSION VERSION_EQUAL 5.10.0
-    OR Qt${QT_MAJOR_VERSION}3DExtras_VERSION VERSION_GREATER 5.10.0)
-    list(APPEND Qt3DExtras_SRC
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_inputstate_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractspritesheet_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmaterial_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritegrid_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheet_wrapper.cpp
-         ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheetitem_wrapper.cpp)
-endif()
 
 set(Qt3DExtras_include_dirs
                      ${Qt3DExtras_SOURCE_DIR}
@@ -55,12 +60,14 @@ set(Qt3DExtras_include_dirs
                      ${pyside6_SOURCE_DIR}
                      ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                      ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
+                     ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS}
                      ${Qt${QT_MAJOR_VERSION}3DCore_INCLUDE_DIRS}
                      ${Qt${QT_MAJOR_VERSION}3DRender_INCLUDE_DIRS}
                      ${Qt${QT_MAJOR_VERSION}3DExtras_INCLUDE_DIRS}
                      ${libpyside_SOURCE_DIR}
                      ${QtCore_GEN_DIR}
                      ${QtGui_GEN_DIR}
+                     ${QtOpenGL_GEN_DIR}
                      ${Qt3DCore_GEN_DIR}
                      ${Qt3DRender_GEN_DIR})