diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-24 16:09:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-24 16:09:47 +0200 |
| commit | dc4ad7f211db52d614426c4f2b7b808c6200ae85 (patch) | |
| tree | e5c62361c4c6a296478a207d4e6fe1df27f36d18 /sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | |
| parent | 6c7e60e7f608b80bc2823ba5e3ff58df76927cbc (diff) | |
| parent | 8b892f71b749a623724ccecca881972a33c9d559 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ieb5a4ac5d5d33fe1e93e1d286f1b88d45f31db06
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 2c14fe35a..1e4215386 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- /**************************************************************************** ** @@ -2878,6 +2878,9 @@ <modify-function signature="setAttributeArray(const char*,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> + <modify-function signature="setAttributeArray(int,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> <modify-function signature="setAttributeValue(int,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> @@ -2902,6 +2905,26 @@ <modify-function signature="setUniformValueArray(const char*,const unsigned int*,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> + <!-- Add explicit signatures for the setUniformValue functions --> + <modify-function signature="setUniformValue(const char*, GLfloat)" remove="all"/> + <modify-function signature="setUniformValue(const char*, GLint)" remove="all"/> + <modify-function signature="setUniformValue(const char*, GLuint)" remove="all"/> + <modify-function signature="setUniformValue(int, GLfloat)" remove="all"/> + <modify-function signature="setUniformValue(int, GLint)" remove="all"/> + <modify-function signature="setUniformValue(int, GLuint)" remove="all"/> + <!-- No need for a signature for GLuint, since Qt (internally) calls the same function: glUniform1i --> + <add-function signature="setUniformValue1f(const char*, float)" return-type="void"> + <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/> + </add-function> + <add-function signature="setUniformValue1i(const char*, int)" return-type="void"> + <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/> + </add-function> + <add-function signature="setUniformValue1f(int, float)" return-type="void"> + <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/> + </add-function> + <add-function signature="setUniformValue1i(int, int)" return-type="void"> + <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/> + </add-function> </object-type> <object-type name="QOpenGLTexture" since="5.2"> <enum-type name="BindingTarget"/> |