From 700ebd831f9ee7143c525bb936cd55f2a91adcc7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 28 Jun 2017 10:12:21 +0200
Subject: Shiboken: Improve Handling of array types

Change the AbstractMetaType::signature() functions to work with the
nested AbstractMetaType types instead of TypeEntry so that the correct
array signatures appear in the signature of AbstractMetaFunction.

Task-number: PYSIDE-354
Task-number: PYSIDE-516
Change-Id: I90aa11891c95ccdcbae81fb70db4bec0e62f5923
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml')

diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
index d5c701b6f..8dea5d67c 100644
--- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
+++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml
@@ -59,6 +59,16 @@
 
   <rejection class="QGLColormap::QGLColormapData"/>
   <rejection class="QGLContext" field-name="currentCtx"/>
+  <rejection class="^QGL.*$" argument-type="^GLboolean( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="^GLchar( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="GLchar *const const*"/>
+  <rejection class="^QGL.*$" argument-type="^GLenum( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\[.*$"/>
+  <rejection class="^QGL.*$" argument-type="^GLdouble( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="GLintptr"/>
+  <rejection class="^QGL.*$" argument-type="^GLint64( const)?\*$"/>
+  <rejection class="^QGL.*$" argument-type="^GLsizei( const)?\*$"/>
 
   <namespace-type name="QGL">
     <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/>
@@ -681,8 +691,6 @@
     <!-- ### -->
 
     <!-- ### Use QMatrixZxY overloads -->
-    <modify-function signature="setUniformValue(int,Array)" remove="all" />
-    <modify-function signature="setUniformValue(const char*,Array)" remove="all" />
     <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" />
     <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" />
     <modify-function signature="setAttributeArray(int, GLenum, const void*, int, int)" remove="all" since="4.7" />
-- 
cgit v1.2.3