diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-21 10:10:19 +0100 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-20 17:28:41 +0000 |
| commit | 0829139d8895f8d23c4d8d4105cfac2464994483 (patch) | |
| tree | 8092618865dc31c89abb79c81460c9c32ae3e7b5 /sources/pyside2/PySide2/Qt3DRender | |
| parent | 84234b3987fa8f78024b650bb0596e64a2030a0e (diff) | |
Add bindings for 5.13
Task-number: PYSIDE-487
Change-Id: I789e0f13062c254fe1766eb10fd68f3bb3373594
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/Qt3DRender')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index c8bf08f4c..73c0c5ba6 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -125,6 +125,13 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.11.0 OR Qt53DRender_VERSION VERSION_GREA ${Qt3DRender_GEN_DIR}/qt3drender_qscreenraycaster_wrapper.cpp) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.13.0 OR Qt53DRender_VERSION VERSION_GREATER 5.13.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qsetfence_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qsharedgltexture_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qwaitfence_wrapper.cpp) +endif() + set(Qt3DRender_include_dirs ${Qt3DRender_SOURCE_DIR} ${Qt3DRender_BINARY_DIR} diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml index 851f46b14..9843a4591 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -56,6 +56,7 @@ <enum-type name="CubeMapFace"/> <enum-type name="ComparisonFunction"/> <enum-type name="ComparisonMode"/> + <enum-type name="HandleType" since="5.13"/> <enum-type name="Filter"/> <enum-type name="Status"/> <enum-type name="Target"/> @@ -102,7 +103,9 @@ </object-type> <object-type name="QClipPlane"/> <object-type name="QColorMask"/> - <object-type name="QComputeCommand"/> + <object-type name="QComputeCommand"> + <enum-type name="RunType" since="5.13"/> + </object-type> <object-type name="QCullFace"> <enum-type name="CullingMode"/> </object-type> @@ -202,12 +205,16 @@ <object-type name="QScissorTest"/> <object-type name="QScreenRayCaster" since="5.11"/> <object-type name="QSeamlessCubemap"/> + <object-type name="QSetFence" since="5.13"> + <enum-type name="HandleType"/> + </object-type> <object-type name="QShaderData"/> <object-type name="QShaderProgram"> <enum-type name="ShaderType"/> <enum-type name="Status"/> </object-type> <object-type name="QShaderProgramBuilder" since="5.10"/> + <object-type name="QSharedGLTexture" since="5.13"/> <object-type name="QSortPolicy"> <enum-type name="SortType"/> </object-type> @@ -252,5 +259,8 @@ <enum-type name="WrapMode"/> </object-type> <object-type name="QViewport"/> + <object-type name="QWaitFence" since="5.13"> + <enum-type name="HandleType"/> + </object-type> </namespace-type> </typesystem> |