From 82934bc00c2de7ea51fd7e95601472fcdf7b6aea Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 23 Sep 2020 14:32:38 +0200
Subject: Adapt to recent changes in qtbase

- Remove QProcess::pid(), adapt test
  (qtbase/0f8848b7e25e4d8fb9265ff6e0aa31946addd741)
- Remove enum from QPrinter
- Add  enum GrabTransition to QPointingDevice
- Remove deprecated functions from QByteArray, QXmlStreamAttributes
- Adapt Qml tests
- Remove fake property from QLayout

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I98cc90723cbeda15b23c5b22d026cb2ab9a358ff
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 46e3c6fe6..144e16ffc 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1805,7 +1805,6 @@
     <!-- ### These overloads must be removed accept strings with \x00 in their contents -->
     <modify-function signature="append(const char*)" remove="all"/>
     <modify-function signature="prepend(const char*)" remove="all"/>
-    <modify-function signature="replace(QByteArray,const char*)" remove="all"/>
     <modify-function signature="operator==(const char*,QByteArray)" remove="all"/>
     <modify-function signature="operator==(QByteArray,const char*)" remove="all"/>
     <modify-function signature="operator>(const char*,QByteArray)" remove="all"/>
@@ -2321,11 +2320,6 @@
         </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qprocess-startdetached"/>
     </modify-function>
-    <!-- Function removed because on windows it returns a win32 specific structure -->
-    <modify-function signature="pid()const" remove="all"/>
-    <add-function signature="pid()" return-type="long">
-        <inject-code file="../glue/qtcore.cpp" snippet="qprocess-pid"/>
-    </add-function>
   </object-type>
   <object-type name="QSignalMapper"/>
 
@@ -2674,7 +2668,6 @@
     <modify-function signature="toList()const" remove="all"/>
     <!-- Remove methods from QList -->
     <modify-function signature="value(qsizetype,const QXmlStreamAttribute&amp;) const" remove="all"/>
-    <modify-function signature="value(qsizetype) const" remove="all"/>
     <modify-function signature="fromList(const QList&lt;QXmlStreamAttribute&gt; &amp;)" remove="all"/>
     <modify-function signature="operator+=(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
     <!-- Expose operator==, != inherited from QList, which the parser does
-- 
cgit v1.2.3