diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-14 15:57:54 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-29 10:45:01 +0000 |
| commit | 313d2807e1aa53a0584f62879284f156f27b83c0 (patch) | |
| tree | a43aedf1c23e842fe1c8b2010dffad3ee71b001f /sources/pyside2/PySide2/QtGui | |
| parent | 1484dc600a35ea5bd1517ed945902151ff293c14 (diff) | |
Add QOpenGLFunctions::glGetString(), QOpenGLExtraFunctions::glGetStringi()
Modify the return type to be a QString.
Task-number: PYSIDE-516
Change-Id: Ic79d4c69956cd439b60face4ce87788c451bfa96
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtGui')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 17 |
1 files changed, 16 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 |