diff options
Diffstat (limited to 'sources/pyside6/PySide6/Qt3DExtras')
| -rw-r--r-- | sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/Qt3DExtras/typesystem_3dextras.xml | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt index 181672c34..6f6f637fe 100644 --- a/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DExtras/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(Qt3DExtras) set(Qt3DExtras_SRC @@ -57,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}) diff --git a/sources/pyside6/PySide6/Qt3DExtras/typesystem_3dextras.xml b/sources/pyside6/PySide6/Qt3DExtras/typesystem_3dextras.xml index 19dda8f7c..d281ae15f 100644 --- a/sources/pyside6/PySide6/Qt3DExtras/typesystem_3dextras.xml +++ b/sources/pyside6/PySide6/Qt3DExtras/typesystem_3dextras.xml @@ -4,13 +4,14 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only --> -<typesystem package="PySide6.Qt3DExtras"> +<typesystem package="PySide6.Qt3DExtras" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="Qt3DRender/typesystem_3drender.xml" generate="no"/> <namespace-type name="Qt3DExtras"> - <object-type name="QAbstractCameraController" since="5.10"> + <object-type name="QAbstractCameraController"> <value-type name="InputState"/> </object-type> - <object-type name="QAbstractSpriteSheet" since="5.10"/> + <object-type name="QAbstractSpriteSheet"/> <object-type name="QConeGeometry"/> <object-type name="QConeMesh"/> <object-type name="QConeGeometryView"/> @@ -21,7 +22,7 @@ <object-type name="QCylinderGeometryView"/> <object-type name="QCylinderMesh"/> <object-type name="QDiffuseMapMaterial"/> - <object-type name="QDiffuseSpecularMaterial" since="5.10"/> + <object-type name="QDiffuseSpecularMaterial"/> <object-type name="QDiffuseSpecularMapMaterial"/> <object-type name="QExtrudedTextGeometry"/> <object-type name="QExtrudedTextMesh"/> @@ -44,9 +45,9 @@ <object-type name="QSphereGeometry"/> <object-type name="QSphereGeometryView"/> <object-type name="QSphereMesh"/> - <object-type name="QSpriteGrid" since="5.10"/> - <object-type name="QSpriteSheet" since="5.10"/> - <object-type name="QSpriteSheetItem" since="5.10"/> + <object-type name="QSpriteGrid"/> + <object-type name="QSpriteSheet"/> + <object-type name="QSpriteSheetItem"/> <object-type name="QText2DEntity"/> <object-type name="QTextureMaterial"/> <object-type name="QTorusGeometry"/> |