diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtQuick3D')
| -rw-r--r-- | sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml | 5 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt index ecc12a26a..37f8ebfb1 100644 --- a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt @@ -1,12 +1,19 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtQuick3D) +set (QtQuick3D_DROPPED_ENTRIES) + set(QtQuick3D_SRC ${QtQuick3D_GEN_DIR}/qquick3d_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dobject_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dgeometry_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dgeometry_attribute_wrapper.cpp +${QtQuick3D_GEN_DIR}/qquick3dgeometry_targetattribute_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dinstancing_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dinstancing_instancetableentry_wrapper.cpp +${QtQuick3D_GEN_DIR}/qquick3drenderextension_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dtexturedata_wrapper.cpp # module is always needed ${QtQuick3D_GEN_DIR}/qtquick3d_module_wrapper.cpp @@ -17,7 +24,6 @@ set(QtQuick3D_include_dirs ${QtQuick3D_SOURCE_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Core_PRIVATE_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS} @@ -25,7 +31,6 @@ set(QtQuick3D_include_dirs ${QtQuick3D_SOURCE_DIR} ${Qt${QT_MAJOR_VERSION}Quick3D_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} ${QtGui_GEN_DIR} - ${QtOpenGL_GEN_DIR} ${QtCore_GEN_DIR} ${QtNetwork_GEN_DIR} ${QtQml_GEN_DIR} @@ -33,19 +38,17 @@ set(QtQuick3D_include_dirs ${QtQuick3D_SOURCE_DIR} ${QtQuick3D_GEN_DIR}) set(QtQuick3D_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Quick3D_LIBRARIES}) + ${Qt${QT_MAJOR_VERSION}Quick3D_LIBRARIES}) + +set(QtQuick3D_deps QtGui QtNetwork QtQml QtQuick) -set(QtQuick3D_deps QtGui QtOpenGL QtNetwork QtQml QtQuick) +check_qt_opengl("Quick3D" QtQuick3D_include_dirs QtQuick3D_deps + QtQuick3D_DROPPED_ENTRIES) create_pyside_module(NAME QtQuick3D INCLUDE_DIRS QtQuick3D_include_dirs LIBRARIES QtQuick3D_libraries DEPS QtQuick3D_deps TYPESYSTEM_PATH QtQuick3D_SOURCE_DIR - SOURCES QtQuick3D_SRC) + SOURCES QtQuick3D_SRC + DROPPED_ENTRIES QtQuick3D_DROPPED_ENTRIES) diff --git a/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml b/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml index d2a145df7..fe8f4e700 100644 --- a/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml +++ b/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml @@ -3,7 +3,8 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only --> -<typesystem package="PySide6.QtQuick3D"> +<typesystem package="PySide6.QtQuick3D" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtQuick/typesystem_quick.xml" generate="no"/> <object-type name="QQuick3D"/> @@ -16,6 +17,7 @@ <enum-type name="Semantic"/> <enum-type name="ComponentType"/> </value-type> + <value-type name="TargetAttribute" since="6.6"/> <enum-type name="PrimitiveType"/> </object-type> <object-type name="QQuick3DInstancing"> @@ -24,4 +26,5 @@ <object-type name="QQuick3DTextureData"> <enum-type name="Format"/> </object-type> + <object-type name="QQuick3DRenderExtension" since="6.7"/> </typesystem> |