diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-03 14:15:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-25 08:06:08 +0200 |
| commit | aeccae345301738e8bd9016739ce0113d40301a6 (patch) | |
| tree | 54ce554746627b2339d6963888f58f2f6f723d0e /sources/pyside2/PySide2/Qt3DRender | |
| parent | b7f63eadeb1b6a3791797e7ecaeb191997395965 (diff) | |
Add bindings for Qt 5.14
Task-number: PYSIDE-487
Change-Id: I52b4c13f881599812a311f01937fde92ba4c0f3f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/Qt3DRender')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index 73c0c5ba6..edd023840 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -132,6 +132,12 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.13.0 OR Qt53DRender_VERSION VERSION_GREA ${Qt3DRender_GEN_DIR}/qt3drender_qwaitfence_wrapper.cpp) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.14.0 OR Qt53DRender_VERSION VERSION_GREATER 5.14.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qnopicking_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qshaderimage_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 be06a3135..477dc605d 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -155,6 +155,7 @@ <object-type name="QMultiSampleAntiAliasing"/> <object-type name="QNoDepthMask"/> <object-type name="QNoDraw"/> + <object-type name="QNoPicking" since="5.14"/> <object-type name="QObjectPicker"/> <object-type name="QPaintedTextureImage"/> <object-type name="QParameter"/> @@ -213,6 +214,10 @@ <enum-type name="ShaderType"/> <enum-type name="Status"/> </object-type> + <object-type name="QShaderImage" since="5.14"> + <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="QSortPolicy"> |