aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-04-25 10:07:09 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-04-26 07:10:25 +0000
commit34d00ae3c265202f02b209878c3e669f1bce7ceb (patch)
treeecc42615d09004c148cb1a33d856c57280e5bb5a /sources/pyside2/PySide2
parent21077bec48f2ca16ec0fed25e0c0af62317606d9 (diff)
Fix warnings about signatures 'setUniformValue(const char*,...)' not being found
Use a regular expression with the types, fixing: qt.shiboken: (gui) signature 'setUniformValue(const char*,GLfloat)' (specified as 'setUniformValue(const char*, GLfloat)') for function modification in 'QOpenGLShaderProgram' not found. Possible candidates: ... setUniformValue(const char*,float,float,float,float) in QOpenGLShaderProgram setUniformValue(const char*,int) in QOpenGLShaderProgram setUniformValue(const char*,uint) in QOpenGLShaderProgram ... Amends 05ae61cba5f943eb58343b44f8d474bc88bf0ce4 Task-number: PYSIDE-989 Change-Id: Ib12ca0309dfa46cca87e8deb546378b185a56b66 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2')
-rw-r--r--sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml7
1 files changed, 1 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index cadfc33fa..f58bde35a 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2906,12 +2906,7 @@
<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"/>
+ <modify-function signature="^setUniformValue\(const char\*,(float|int|uint)\)$" 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"/>