1 files changed, 31 insertions, 25 deletions
diff --git a/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml b/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml
index 3d9a9f2dc..66fd70927 100644
--- a/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml
+++ b/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml
@@ -4,15 +4,24 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 -->
 
-<typesystem package="PySide6.Qt3DRender">
+<typesystem package="PySide6.Qt3DRender"
+            namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE">
     <load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/>
+    <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+    <!-- PYSIDE-2610: QOpenGLTexture's enums are used -->
+    <?if !no_QtOpenGL?>
+    <load-typesystem name="QtOpenGL/typesystem_opengl.xml" generate="no"/>
+    <?endif?>
+    <smart-pointer-type name="QSharedPointer" type="shared" getter="data"
+                        reset-method="reset"
+                        instantiations="Qt3DRender::PropertyReaderInterface=Qt3DRender::PropertyReaderInterfacePtr,Qt3DRender::QTextureImageData=Qt3DRender::QTextureImageDataPtr,Qt3DRender::QTextureImageDataGenerator=Qt3DRender::QTextureImageDataGeneratorPtr"/>
     <namespace-type name="Qt3DRender">
         <enum-type name="API"/>
         <object-type name="PropertyReaderInterface"/>
         <object-type name="QAbstractLight">
             <enum-type name="Type"/>
         </object-type>
-        <object-type name="QAbstractRayCaster" since="5.11">
+        <object-type name="QAbstractRayCaster">
             <enum-type name="RunMode"/>
             <enum-type name="FilterMode"/>
         </object-type>
@@ -20,15 +29,13 @@
             <enum-type name="CubeMapFace"/>
             <enum-type name="ComparisonFunction"/>
             <enum-type name="ComparisonMode"/>
-            <enum-type name="HandleType" since="5.13"/>
+            <enum-type name="HandleType"/>
             <enum-type name="Filter"/>
             <enum-type name="Status"/>
             <enum-type name="Target"/>
             <enum-type name="TextureFormat"/>
         </object-type>
-        <object-type name="QAbstractTextureImage">
-            <modify-function signature="QAbstractTextureImage(Qt3DCore::QNode*)" remove="all"/>
-        </object-type>
+        <object-type name="QAbstractTextureImage"/>
         <object-type name="QAlphaCoverage"/>
         <object-type name="QAlphaTest">
             <enum-type name="AlphaFunction"/>
@@ -39,7 +46,7 @@
         <object-type name="QBlendEquationArguments">
             <enum-type name="Blending"/>
         </object-type>
-        <object-type name="QBlitFramebuffer" since="5.10">
+        <object-type name="QBlitFramebuffer">
             <enum-type name="InterpolationMethod"/>
         </object-type>
         <object-type name="QBufferCapture"/>
@@ -56,11 +63,12 @@
         <object-type name="QClipPlane"/>
         <object-type name="QColorMask"/>
         <object-type name="QComputeCommand">
-            <enum-type name="RunType" since="5.13"/>
+            <enum-type name="RunType"/>
         </object-type>
         <object-type name="QCullFace">
             <enum-type name="CullingMode"/>
         </object-type>
+        <object-type name="QDebugOverlay"/>
         <object-type name="QDepthRange"/>
         <object-type name="QDepthTest">
             <enum-type name="DepthFunction"/>
@@ -97,7 +105,7 @@
         </object-type>
         <object-type name="QLevelOfDetailBoundingSphere"/>
         <object-type name="QLevelOfDetailSwitch"/>
-        <object-type name="QLineWidth" since="5.10"/>
+        <object-type name="QLineWidth"/>
         <object-type name="QMaterial"/>
         <object-type name="QMemoryBarrier">
             <enum-type name="Operation" flags="Operations"/>
@@ -108,7 +116,7 @@
         <object-type name="QMultiSampleAntiAliasing"/>
         <object-type name="QNoDepthMask"/>
         <object-type name="QNoDraw"/>
-        <object-type name="QNoPicking" since="5.14"/>
+        <object-type name="QNoPicking"/>
         <object-type name="QObjectPicker"/>
         <object-type name="QPaintedTextureImage"/>
         <object-type name="QParameter"/>
@@ -117,8 +125,8 @@
             <enum-type name="Modifiers"/>
         </object-type>
         <object-type name="QPickingProxy"/>
-        <object-type name="QPickLineEvent" since="5.10"/>
-        <object-type name="QPickPointEvent" since="5.10"/>
+        <object-type name="QPickLineEvent"/>
+        <object-type name="QPickPointEvent"/>
         <object-type name="QPickTriangleEvent"/>
         <object-type name="QPickingSettings">
             <enum-type name="FaceOrientationPickingMode"/>
@@ -130,19 +138,19 @@
             <enum-type name="SizeMode"/>
         </object-type>
         <object-type name="QPolygonOffset"/>
-        <object-type name="QProximityFilter" since="5.10"/>
+        <object-type name="QProximityFilter"/>
         <object-type name="QRasterMode">
             <enum-type name="RasterMode"/>
             <enum-type name="FaceMode"/>
         </object-type>
-        <object-type name="QRayCaster" since="5.11"/>
-        <value-type name="QRayCasterHit" since="5.11">
+        <object-type name="QRayCaster"/>
+        <value-type name="QRayCasterHit">
             <enum-type name="HitType"/>
         </value-type>
         <object-type name="QRenderAspect">
             <enum-type name="SubmissionType"/>
         </object-type>
-        <object-type name="QRenderCapabilities" since="5.15">
+        <object-type name="QRenderCapabilities">
             <enum-type name="API"/>
             <enum-type name="Profile"/>
         </object-type>
@@ -166,9 +174,9 @@
             <enum-type name="ComponentType"/>
         </object-type>
         <object-type name="QScissorTest"/>
-        <object-type name="QScreenRayCaster" since="5.11"/>
+        <object-type name="QScreenRayCaster"/>
         <object-type name="QSeamlessCubemap"/>
-        <object-type name="QSetFence" since="5.13">
+        <object-type name="QSetFence">
             <enum-type name="HandleType"/>
         </object-type>
         <object-type name="QShaderData"/>
@@ -177,12 +185,12 @@
             <enum-type name="ShaderType"/>
             <enum-type name="Status"/>
         </object-type>
-        <object-type name="QShaderImage" since="5.14">
+        <object-type name="QShaderImage">
             <enum-type name="Access"/>
             <enum-type name="ImageFormat"/>
         </object-type>
-        <object-type name="QShaderProgramBuilder" since="5.10"/>
-        <object-type name="QSharedGLTexture" since="5.13"/>
+        <object-type name="QShaderProgramBuilder"/>
+        <object-type name="QSharedGLTexture"/>
         <object-type name="QSortPolicy">
             <enum-type name="SortType"/>
         </object-type>
@@ -219,16 +227,14 @@
             <enum-type name="Status"/>
         </object-type>
         <object-type name="QTextureImageData"/>
-        <object-type name="QTextureImageDataGenerator">
-            <modify-function signature="QTextureImageDataGenerator()" remove="all"/>
-        </object-type>
+        <object-type name="QTextureImageDataGenerator"/>
         <object-type name="QTextureLoader"/>
         <object-type name="QTextureRectangle"/>
         <object-type name="QTextureWrapMode">
             <enum-type name="WrapMode"/>
         </object-type>
         <object-type name="QViewport"/>
-        <object-type name="QWaitFence" since="5.13">
+        <object-type name="QWaitFence">
             <enum-type name="HandleType"/>
         </object-type>
     </namespace-type>