PySide6: Add further global functions

Task-number: PYSIDE-1482
Pick-to: 6.1
Change-Id: I337f8c817bc4d612a02a5482a63a94303e11c300
Reviewed-by: Christian Tismer <tismer@stackless.com>

7 files changed, 46 insertions, 4 deletions

diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 447277b68..78dd8a941 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -72,6 +72,8 @@
     <function signature="qCompress(const QByteArray&amp;,int)"/>
     <function signature="qUncompress(const uchar*,qsizetype)"/>
     <function signature="qUncompress(const QByteArray&amp;)"/>
+    <function signature="qFormatLogMessage(QtMsgType,const QMessageLogContext&amp;,const QString&amp;)"/>
+    <function signature="qSetMessagePattern(const QString&amp;)"/>
 
     <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="include-pyside"/>
 
diff --git a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
index afd5bdadd..66f0784e8 100644
--- a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
+++ b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
@@ -43,6 +43,9 @@
 
   <load-typesystem name="templates/datavisualization_common.xml" generate="no" />
   <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" />
+
+  <function signature="qDefaultSurfaceFormat(bool)"/>
+
   <primitive-type name="QBarDataArray">
     <include file-name="qbardataproxy.h" location="global"/>
     <conversion-rule>
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index 534ccaaf6..c04517119 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -64,6 +64,13 @@
   <function signature="qFuzzyCompare(QVector2D,QVector2D)"/>
   <function signature="qFuzzyCompare(QVector3D,QVector3D)"/>
   <function signature="qFuzzyCompare(QVector4D,QVector4D)"/>
+  <function signature="qPixelFormatRgba(uchar,uchar,uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::AlphaPremultiplied,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatGrayscale(uchar,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatAlpha(uchar,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatCmyk(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition position,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatHsl(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatHsv(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::TypeInterpretation)"/>
+  <function signature="qPixelFormatYuv(QPixelFormat::YUVLayout,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::AlphaPremultiplied,QPixelFormat::TypeInterpretation,QPixelFormat::ByteOrder)"/>
   <rejection class="*" function-name="qobject_interface_iid&lt;QStyleFactoryInterface*&gt;"/>
   <rejection class="*" function-name="qobject_interface_iid&lt;QAccessibleFactoryInterface*&gt;"/>
   <rejection class="*" function-name="qobject_interface_iid&lt;QInputContextFactoryInterface*&gt;"/>
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
index 449ae0c51..fdc10559a 100644
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml
@@ -75,6 +75,19 @@
     besides the fact they are accessible by ordinary event methods.
     -->
 
+  <function signature="qDrawShadeLine(QPainter*,int,int,int,int,const QPalette&amp;,bool,int,int)"/>
+  <function signature="qDrawShadeLine(QPainter*,const QPoint,const QPoint,const QPalette&amp;,bool,int,int)"/>
+  <function signature="qDrawShadeRect(QPainter*,int,int,int,int,const QPalette&amp;,bool,int,int,const QBrush*)"/>
+  <function signature="qDrawShadeRect(QPainter*,const QRect &amp;,const QPalette&amp;,bool,int,int,const QBrush*)"/>
+  <function signature="qDrawShadePanel(QPainter*,int,int,int,int,const QPalette&amp;,bool,int,const QBrush*)"/>
+  <function signature="qDrawShadePanel(QPainter*,const QRect&amp;,const QPalette&amp;,bool,int,const QBrush*)"/>
+  <function signature="qDrawWinButton(QPainter*,int,int,int,int,const QPalette&amp;,bool,const QBrush*)"/>
+  <function signature="qDrawWinButton(QPainter*,const QRect&amp;,const QPalette&amp;,bool,const QBrush*fill)"/>
+  <function signature="qDrawWinPanel(QPainter*,int,int,int,int,const QPalette&amp;,bool,const QBrush*)"/>
+  <function signature="qDrawWinPanel(QPainter*,const QRect&amp;,const QPalette&amp;,bool,const QBrush*)"/>
+  <function signature="qDrawPlainRect(QPainter*,int,int,int,int,const QColor&amp;,int,const QBrush*)"/>
+  <function signature="qDrawPlainRect(QPainter*,const QRect&amp;,const QColor&amp;,int,const QBrush*)"/>
+
   <object-type name="QStyleOption" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
     <enum-type name="OptionType"/>
     <enum-type name="StyleOptionType"/>
diff --git a/sources/pyside6/tests/QtCore/qinstallmsghandler_test.py b/sources/pyside6/tests/QtCore/qinstallmsghandler_test.py
index 7043ec7d7..df636cdd1 100644
--- a/sources/pyside6/tests/QtCore/qinstallmsghandler_test.py
+++ b/sources/pyside6/tests/QtCore/qinstallmsghandler_test.py
@@ -37,8 +37,10 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-from PySide6.QtCore import (QLibraryInfo, QtCriticalMsg, QtDebugMsg, QtWarningMsg,
-                            qCritical, qDebug, qInstallMessageHandler, qWarning)
+from PySide6.QtCore import (QLibraryInfo, QtCriticalMsg, QtDebugMsg, QtInfoMsg,
+                            QMessageLogContext,
+                            QtWarningMsg, qCritical, qFormatLogMessage, qDebug,
+                            qInstallMessageHandler, qWarning)
 
 
 param = []
@@ -87,6 +89,11 @@ class QInstallMsgHandlerTest(unittest.TestCase):
         self.assertEqual(param[0], QtCriticalMsg)
         self.assertEqual(param[2], "Test Critical")
 
+    def testFormat(self):
+        ctx = QMessageLogContext()
+        s = qFormatLogMessage(QtInfoMsg, ctx, 'bla')
+        self.assertTrue(s)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py
index 9c3ecc17b..4e5528cd4 100644
--- a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py
+++ b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py
@@ -43,7 +43,7 @@ from helper.usesqguiapplication import UsesQGuiApplication
 from PySide6.QtCore import QTimer
 from PySide6.QtDataVisualization import (Q3DBars, QBar3DSeries, QBarDataItem,
                                          QBarDataProxy, QCategory3DAxis,
-                                         QValue3DAxis)
+                                         QValue3DAxis, qDefaultSurfaceFormat)
 
 
 def dataToBarDataRow(data):
@@ -106,6 +106,10 @@ class QtDataVisualizationTestCase(UsesQGuiApplication):
         data_proxy.setRow(0, items, 'bla')
         self.assertTrue(data_proxy.rowCount(), 4)
 
+    def testDefaultSurfaceFormat(self):
+         format = qDefaultSurfaceFormat(True)
+         print(format)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside6/tests/QtGui/qpixelformat_test.py b/sources/pyside6/tests/QtGui/qpixelformat_test.py
index 448bc3d5a..e2fd084af 100644
--- a/sources/pyside6/tests/QtGui/qpixelformat_test.py
+++ b/sources/pyside6/tests/QtGui/qpixelformat_test.py
@@ -39,7 +39,7 @@ init_test_paths(False)
 
 from helper.usesqapplication import UsesQApplication
 from PySide6.QtCore import QSize, Qt
-from PySide6.QtGui import QColor, QImage, QPixelFormat
+from PySide6.QtGui import QColor, QImage, QPixelFormat, qPixelFormatRgba
 
 
 class QPixelFormatTest(UsesQApplication):
@@ -54,6 +54,12 @@ class QPixelFormatTest(UsesQApplication):
         self.assertEqual(pixelFormat.blueSize(), 8)
         self.assertEqual(pixelFormat.bitsPerPixel(), 32)
 
+    def testHelpers(self):
+        format = qPixelFormatRgba(8, 8, 8, 8, QPixelFormat.UsesAlpha,
+                                  QPixelFormat.AtBeginning, QPixelFormat.Premultiplied,
+                                  QPixelFormat.UnsignedByte)
+        self.assertEqual(format.redSize(), 8)
+
 
 if __name__ == '__main__':
     unittest.main()