From f9b6351c5b9ec947c0bf189426e0ddec29371c7c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 11 May 2023 14:43:22 +0200
Subject: PySide6: Fix some generation warnings

Remove obsolete enumerations and classes.
Add a few new enums.

Pick-to: 6.5
Change-Id: I8283cb7b20000839b2c9f4ba16b9a69ffab9f2c6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
---
 sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml | 2 +-
 sources/pyside6/PySide6/QtCore/typesystem_core_common.xml      | 3 +++
 sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 1 -
 sources/pyside6/PySide6/QtPdf/typesystem_pdf.xml               | 1 -
 sources/pyside6/PySide6/QtTest/typesystem_test.xml             | 1 +
 sources/pyside6/PySide6/QtXml/typesystem_xml.xml               | 8 +-------
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml b/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml
index c1e6cafad..de0580803 100644
--- a/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml
+++ b/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml
@@ -10,6 +10,7 @@
         the name space from QtCore -->
   <namespace-type name="QtConcurrent" target-type="class">
     <rejection class="QtConcurrent" enum-name="enum_1"/>
+    <enum-type name="FutureResult"/>
     <enum-type name="ReduceOption" flags="ReduceOptions"/>
     <enum-type name="ThreadFunctionResult"/>
     <extra-includes>
@@ -20,7 +21,6 @@
 
   <typedef-type name="QFutureVoid" source="QFuture&lt;void&gt;" disable-wrapper="yes">
       <include file-name="QtCore/qfuture.h" location="global"/>
-      <modify-function signature="isResultReadyAt(int) const" remove="all"/>
   </typedef-type>
   <typedef-type name="QFutureQString" source="QFuture&lt;QString&gt;" disable-wrapper="yes">
       <include file-name="QtCore/qfuture.h" location="global"/>
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index ffb6cef1a..057f35caa 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -107,6 +107,9 @@
   <rejection class="*" function-name="qMallocAligned"/>
   <rejection class="*" function-name="qFreeAligned"/>
   <rejection class="QMetaMethod" enum-name="Attributes"/>
+  <rejection class="QMetaMethod" field-name="data"/>
+  <rejection class="Qt" field-name="Disambiguated"/>
+  <rejection class="" enum-name="QCborNegativeInteger"/>
 
   <rejection class="*" argument-type="^qfloat16&amp;?$"/>
   <rejection class="*" argument-type="QLatin1String"/>
diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
index 89a0c8bdb..9f0e92561 100644
--- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
+++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
@@ -10,7 +10,6 @@
 
     <namespace-type name="QAudio">
         <enum-type name="Error"/>
-        <enum-type name="Mode"/>
         <enum-type name="State"/>
         <enum-type name="VolumeScale"/>
     </namespace-type>
diff --git a/sources/pyside6/PySide6/QtPdf/typesystem_pdf.xml b/sources/pyside6/PySide6/QtPdf/typesystem_pdf.xml
index afb93f7e3..2d59020c6 100644
--- a/sources/pyside6/PySide6/QtPdf/typesystem_pdf.xml
+++ b/sources/pyside6/PySide6/QtPdf/typesystem_pdf.xml
@@ -21,7 +21,6 @@
     </value-type>
     <object-type name="QPdfPageRenderer">
         <enum-type name="RenderMode"/>
-        <enum-type name="RenderFlag" flags="RenderFlags"/>
     </object-type>
     <value-type name="QPdfLink"/>
     <object-type name="QPdfPageNavigator"/>
diff --git a/sources/pyside6/PySide6/QtTest/typesystem_test.xml b/sources/pyside6/PySide6/QtTest/typesystem_test.xml
index c8c814992..d1f4d6634 100644
--- a/sources/pyside6/PySide6/QtTest/typesystem_test.xml
+++ b/sources/pyside6/PySide6/QtTest/typesystem_test.xml
@@ -91,6 +91,7 @@
     <enum-type name="MouseAction"/>
     <enum-type name="QBenchmarkMetric" since="4.7"/>
     <enum-type name="TestFailMode"/>
+    <enum-type name="ComparisonOperation" since="6.4"/>
     <extra-includes>
         <include file-name="QtTest" location="global"/>
     </extra-includes>
diff --git a/sources/pyside6/PySide6/QtXml/typesystem_xml.xml b/sources/pyside6/PySide6/QtXml/typesystem_xml.xml
index 53cacb89a..f35634285 100644
--- a/sources/pyside6/PySide6/QtXml/typesystem_xml.xml
+++ b/sources/pyside6/PySide6/QtXml/typesystem_xml.xml
@@ -19,6 +19,7 @@
 
 
     <value-type name="QDomDocument">
+        <enum-type name="ParseOption" flags="ParseOptions" since="6.5"/>
         <!-- will be replaced in inject code -->
         <modify-function signature="setContent(const QByteArray&amp;,bool,QString*,int*,int*)">
             <modify-argument index="3">
@@ -167,12 +168,5 @@
         <modify-function signature="setAttribute(const QString&amp;, qulonglong)" remove="all"/>
     </value-type>
 
-    <object-type name="QXmlContentHandler">
-        <modify-function signature="setDocumentLocator(QXmlLocator*)">
-            <modify-argument index="1">
-                <define-ownership owner="c++"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
 </typesystem>
 
-- 
cgit v1.2.3