From 92f5479681e63b54aaf26c0b7b6972b0cf3cbf87 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 3 Mar 2021 17:19:05 +0100
Subject: Fix broken return type conversions of
 QOpenGLExtraFunctions::glGetStringi()

The function returns const unsigned char*, which was converted using
the wrong snippet (QString conversion of parameter 1). Add a new snippet
using the char *conversion of the return value at the end.

Fixes warning:

PySide6/QtGui/PySide6/QtGui/qopenglextrafunctions_wrapper.cpp:4630:35: warning: unused variable cppResunused-variable]
     const unsigned char * cppResult = cppSelf->glGetStringi(cppArg0, cppArg1);

Change-Id: Iae3f0abd4a34fb3b6a41534508fb5d64a3eae224
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index aa8391f8f..2a5a905ba 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2835,7 +2835,8 @@
           <modify-argument index="return">
               <replace-type modified-type="QString"/>
           </modify-argument>
-          <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qstring-return"/>
+          <inject-code class="target" position="end" file="../glue/qtgui.cpp"
+                       snippet="glgetstring-return"/>
       </modify-function>
   </object-type>
   <object-type name="QOpenGLFunctions" since="5.0">
-- 
cgit v1.2.3


From 4621b1afab446e5171af0f10ab6ae987dc4c6ff7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Sat, 13 Mar 2021 21:45:24 +0100
Subject: PySide2: Implement QOpenGLContext.versionFunctions()

Forward the call to QOpenGLVersionFunctionsFactory.get().

Fixes: PYSIDE-955
Change-Id: I17df7784acdf1311c4c22c54537620bcc9d2a3b2
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 2a5a905ba..e55d40eb9 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2601,6 +2601,10 @@
   </object-type>
   <object-type name="QOpenGLContext">
     <enum-type name="OpenGLModuleType"/>
+    <modify-function signature="versionFunctions(const QOpenGLVersionProfile&amp;) const">
+    <inject-code class="target" position="beginning" file="../glue/qtgui.cpp"
+                 snippet="qopenglcontext-versionfunctions"/>
+    </modify-function>
   </object-type>
   <object-type name="QOpenGLContextGroup" since="5.0"/>
   <object-type name="QOpenGLDebugLogger" since="5.1">
-- 
cgit v1.2.3


From d47736aef4794c4eb81199d71f82ec1ebaced6cf Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 13 Apr 2021 15:21:19 +0200
Subject: PySide6: Fix performance of QPainter::drawPoints(QPolygon)

Reorder the overloads so that the QPolygon overload is checked first
before the costly sequence type check of the QPoint list.
Speeds up the example from 1800ms to 80ms.

Fixes: PYSIDE-1540
Change-Id: I108b0e98c82540703ee80345026ecdc3b55dfd4e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit ef707d2077862933b767bccf17ca0c54f9475de0)
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index e55d40eb9..b0c61fe64 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -1871,18 +1871,23 @@
     <modify-function signature="drawRects(const QRect*,int)" remove="all"/>
     <modify-function signature="drawRects(const QRectF*,int)" remove="all"/>
     <!-- ### -->
+    <!-- PYSIDE-1540: Preferably use the QPolygon overloads first to avoid
+         a costly sequence type check on QPolygon. -->
     <modify-function signature="drawPoints(const QPoint*,int)" remove="all"/>
-    <add-function signature="drawPoints(QVector&lt;QPoint>)">
+    <add-function signature="drawPoints(QVector&lt;QPoint>)" overload-number="2">
         <inject-code>
             <insert-template name="qpainter_drawlist"/>
         </inject-code>
     </add-function>
     <modify-function signature="drawPoints(const QPointF*,int)" remove="all"/>
-    <add-function signature="drawPoints(QVector&lt;QPointF>)">
+    <add-function signature="drawPoints(QVector&lt;QPointF>)" overload-number="3">
         <inject-code>
             <insert-template name="qpainter_drawlist"/>
         </inject-code>
     </add-function>
+    <modify-function signature="drawPoints(const QPolygon&amp;)" overload-number="0"/>
+    <modify-function signature="drawPoints(const QPolygonF&amp;)" overload-number="1"/>
+
     <modify-function signature="drawPolygon(const QPoint*,int,Qt::FillRule)" remove="all"/>
     <add-function signature="drawPolygon(QVector&lt;QPoint>,Qt::FillRule)">
         <inject-code file="../glue/qtgui.cpp" snippet="qpainter-drawpolygon"/>
-- 
cgit v1.2.3