diff options
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 17 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/typesystem_templates.xml | 8 |
2 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 4ab7c6944..5dbc5f163 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -106,7 +106,6 @@ <rejection class="^QOpenGL.*$" argument-type="GLsizeiptr"/> <rejection class="^QOpenGL.*$" argument-type="GLsync"/> <rejection class="^QOpenGL.*$" argument-type="^GLubyte( const)?\*$"/> - <rejection class="^QOpenGL.*$" return-type="^GLubyte( const)?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^QMatrix.x.( const)?\*$"/> <rejection class="^QOpenGL.*$" argument-type="qopengl_GLintptr"/> <rejection class="^QOpenGL.*$" argument-type="qopengl_GLsizeiptr"/> @@ -3504,6 +3503,14 @@ <modify-function signature="glVertexAttribI4uiv(unsigned int,const unsigned int*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> + <modify-function signature="glGetStringi(unsigned int,unsigned int)"> + <modify-argument index="return"> + <replace-type modified-type="QString" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="glGetString_return_QString"/> + </inject-code> + </modify-function> </object-type> <object-type name="QOpenGLFunctions" since="5.0"> <enum-type name="OpenGLFeature" flags="OpenGLFeatures"/> @@ -3557,6 +3564,14 @@ <modify-function signature="^glGetVertexAttrib[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> + <modify-function signature="glGetString(unsigned int)"> + <modify-argument index="return"> + <replace-type modified-type="QString" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="glGetString_return_QString"/> + </inject-code> + </modify-function> </object-type> <object-type name="QAbstractOpenGLFunctions" since="5.1"/> <!-- Classes are result of a macro expansion in src/gui/opengl/qopenglversionfunctions.h diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml index 7ac4ac158..1715c0253 100644 --- a/sources/pyside2/PySide2/typesystem_templates.xml +++ b/sources/pyside2/PySide2/typesystem_templates.xml @@ -167,6 +167,14 @@ %PYARG_0 = %CONVERTTOPYTHON[QRectF](rect_); </template> + <template name="glGetString_return_QString"> + %BEGIN_ALLOW_THREADS + const GLubyte *us = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES); + const QString s = QString::fromLocal8Bit(reinterpret_cast<const char *>(us)); + %END_ALLOW_THREADS + %PYARG_0 = %CONVERTTOPYTHON[QString](s); + </template> + <template name="fix_args,QRect*"> QRect rect_; %BEGIN_ALLOW_THREADS |