diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:34:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:42:35 +0100 |
| commit | 1704567d7ad0d21dd3b588af7aad40cd244c1799 (patch) | |
| tree | 932b42988e482f01125dcbf4d470e9a56107689a /sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml | |
| parent | 1d77cd18510412242384c5b37a00efd5b6ce8a26 (diff) | |
| parent | c98ef56544cd54661b61529829caf6a799a1a94f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml | 5 |
1 files changed, 5 insertions, 0 deletions
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"> |