Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6

Test failures:
  shiboken2:testmodifyfunction
  pyside2:QtCore::qbytearray_test
  pyside2:QtGui::bug_PYSIDE-41
  pyside2:QtGui::deepcopy_test
  pyside2:QtGui::qfontmetrics_test
  pyside2:QtGui::qpixmapcache_test
  pyside2:QtWidgets::api2_test (QTBUG-85417)
  pyside2:QtWidgets::bug_632
  pyside2:QtWidgets::bug_714
  pyside2:QtWidgets::bug_785
  pyside2:QtWidgets::qshortcut_test
  pyside2:QtQml::bug_825
  pyside2:QtQml::bug_1029
  pyside2:QtQml::registertype
  pyside2:QtQml::qqmlincubator_incubateWhile
  pyside2:QtQml::signal_arguments

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 3 insertions, 155 deletions

diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
index 506a6fc78..5383d9410 100644
--- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
@@ -9,8 +9,6 @@ ${QtWidgets_GEN_DIR}/qabstractitemview_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qabstractscrollarea_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qabstractslider_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qabstractspinbox_wrapper.cpp
-${QtWidgets_GEN_DIR}/qaction_wrapper.cpp
-${QtWidgets_GEN_DIR}/qactiongroup_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qapplication_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qboxlayout_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qbuttongroup_wrapper.cpp
@@ -26,11 +24,9 @@ ${QtWidgets_GEN_DIR}/qcompleter_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdatawidgetmapper_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdateedit_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdatetimeedit_wrapper.cpp
-${QtWidgets_GEN_DIR}/qdesktopwidget_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdial_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdialog_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdialogbuttonbox_wrapper.cpp
-${QtWidgets_GEN_DIR}/qdirmodel_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdockwidget_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qdoublespinbox_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qerrormessage_wrapper.cpp
@@ -109,7 +105,6 @@ ${QtWidgets_GEN_DIR}/qmenu_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qmenubar_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qmessagebox_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qmouseeventtransition_wrapper.cpp
-${QtWidgets_GEN_DIR}/qopenglwidget_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qpangesture_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qpinchgesture_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qplaintextdocumentlayout_wrapper.cpp
@@ -124,7 +119,6 @@ ${QtWidgets_GEN_DIR}/qscrollarea_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qscrollbar_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qscroller_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qscrollerproperties_wrapper.cpp
-${QtWidgets_GEN_DIR}/qshortcut_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qsizegrip_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qsizepolicy_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qslider_wrapper.cpp
@@ -190,9 +184,6 @@ ${QtWidgets_GEN_DIR}/qtreeview_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qtreewidget_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qtreewidgetitem_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qtreewidgetitemiterator_wrapper.cpp
-${QtWidgets_GEN_DIR}/qundocommand_wrapper.cpp
-${QtWidgets_GEN_DIR}/qundogroup_wrapper.cpp
-${QtWidgets_GEN_DIR}/qundostack_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qundoview_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qvboxlayout_wrapper.cpp
 ${QtWidgets_GEN_DIR}/qwhatsthis_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index d2fc0705e..160082d07 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -235,7 +235,7 @@
 
   <object-type name="QLayoutItem">
 
-    <modify-function signature="widget()">
+    <modify-function signature="widget()const">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
       </modify-argument>
@@ -461,19 +461,6 @@
     <enum-type name="SliderAction"/>
     <enum-type name="SliderChange"/>
   </object-type>
-  <object-type name="QActionGroup">
-    <enum-type name="ExclusionPolicy" since="5.14"/>
-    <modify-function signature="addAction(QAction*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="removeAction(QAction*)">
-      <modify-argument index="1">
-        <parent index="this" action="remove"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QCheckBox"/>
   <object-type name="QCommonStyle">
   </object-type>
@@ -525,14 +512,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QDirModel" polymorphic-id-expression="qobject_cast&lt;QDirModel*&gt;(%1)">
-    <enum-type name="Roles"/>
-    <modify-function signature="setIconProvider(QFileIconProvider*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QFileIconProvider">
       <enum-type name="IconType"/>
       <enum-type name="Option" flags="Options"/>
@@ -638,8 +617,6 @@
   <object-type name="QItemDelegate">
     <!-- ### "doLayout(...)" is an internal method. -->
     <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const" remove="all"/>
-    <!-- ### "selected(QPixmap,QPalette,bool)" is an internal method. -->
-    <modify-function signature="selected(QPixmap,QPalette,bool)const" remove="all"/>
     <!-- ### -->
     <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const">
       <modify-argument index="1" invalidate-after-use="yes"/>
@@ -963,15 +940,6 @@
     </modify-function>
   </object-type>
 
-  <object-type name="QShortcut">
-    <add-function signature="QShortcut(QKeySequence&amp;,QWidget*,PyCallable*,Qt::ShortcutContext)">
-      <modify-argument index="4">
-        <replace-default-expression with="Qt::WindowShortcut"/>
-      </modify-argument>
-      <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qshortcut-1"/>
-      <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qshortcut-2"/>
-    </add-function>
-  </object-type>
   <object-type name="QSpacerItem"/>
   <object-type name="QStatusBar">
     <modify-function signature="addWidget(QWidget*,int)">
@@ -1078,40 +1046,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QUndoCommand">
-    <modify-function signature="mergeWith(const QUndoCommand*)">
-      <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>
-  </object-type>
-  <object-type name="QUndoGroup">
-    <modify-function signature="addStack(QUndoStack*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="removeStack(QUndoStack*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="QUndoStack">
-    <modify-function signature="createUndoAction(QObject*,const QString&amp;)const">
-      <modify-argument index="return">
-        <parent index="1" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="createRedoAction(QObject*,const QString&amp;)const">
-      <modify-argument index="return">
-        <parent index="1" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="push(QUndoCommand*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
   <object-type name="QUndoView">
     <modify-function signature="setGroup(QUndoGroup*)">
       <modify-argument index="1">
@@ -1252,8 +1186,6 @@
   <object-type name="QColorDialog">
     <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/>
     <modify-function signature="getColor(const QColor&amp;,QWidget*,const QString&amp;,QFlags&lt;QColorDialog::ColorDialogOption>)" allow-thread="yes"/>
-    <!-- Qt5: obsolete -->
-    <modify-function signature="getRgba(unsigned int,bool*,QWidget*)" remove="all"/>
   </object-type>
 
   <object-type name="QLayout">
@@ -1562,16 +1494,6 @@
       </inject-code>
     </modify-function>
 
-    <modify-function signature="getDouble(QWidget*,const QString&amp;,const QString&amp;,double,double,double,int,bool*,QFlags&lt;Qt::WindowType&gt;)" allow-thread="yes">
-      <modify-argument index="8">
-        <remove-default-expression/>
-        <remove-argument/>
-      </modify-argument>
-      <inject-code class="target" position="beginning">
-        <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/>
-      </inject-code>
-    </modify-function>
-
     <modify-function signature="getDouble(QWidget*,const QString&amp;,const QString&amp;,double,double,double,int,bool*,QFlags&lt;Qt::WindowType&gt;,double)" allow-thread="yes">
       <modify-argument index="8">
         <remove-default-expression/>
@@ -2024,7 +1946,7 @@
 
   <object-type name="QWidget" delete-in-main-thread="true">
     <!-- see QWindow::nativeEvent(), QAbstractNativeEventFilter::nativeEventFilter() -->
-    <modify-function signature="nativeEvent(const QByteArray &amp;,void*,long*)">
+    <modify-function signature="nativeEvent(const QByteArray &amp;,void*,qintptr*)">
       <modify-argument index="3">
         <remove-argument/>
         <conversion-rule class="native">
@@ -2225,33 +2147,6 @@
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
-        <modify-argument index="0">
-            <replace-type modified-type="PyObject"/>
-        </modify-argument>
-        <modify-argument index="1">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="2">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="3">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="4">
-            <remove-argument/>
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_number*,number*,number*,number*">
-                <replace from="$TYPE" to="int"/>
-            </insert-template>
-        </inject-code>
-        <inject-code class="native" position="end">
-            <insert-template name="fix_native_return_number*,number*,number*,number*">
-                <replace from="$TYPE" to="int"/>
-            </insert-template>
-        </inject-code>
-    </modify-function>
     <modify-function signature="insertAction(QAction*,QAction*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
@@ -2706,28 +2601,6 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="del()" rename="del_"/>
-    <modify-function signature="getTextMargins(int*,int*,int*,int*)const">
-        <modify-argument index="0">
-            <replace-type modified-type="PyObject*"/>
-        </modify-argument>
-        <modify-argument index="1">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="2">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="3">
-            <remove-argument/>
-        </modify-argument>
-        <modify-argument index="4">
-            <remove-argument/>
-        </modify-argument>
-        <inject-code class="target" position="beginning">
-            <insert-template name="fix_number*,number*,number*,number*">
-                <replace from="$TYPE" to="int"/>
-            </insert-template>
-        </inject-code>
-    </modify-function>
 
     <add-function signature="addAction(QAction*)">
       <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlineedit-addaction"/>
@@ -2738,9 +2611,6 @@
       <enum-type name="Mode"/>
       <enum-type name="SegmentStyle"/>
   </object-type>
-  <object-type name="QOpenGLWidget">
-      <enum-type name="UpdateBehavior"/>
-  </object-type>
   <object-type name="QSplashScreen">
     <!-- Override QWidget.painter -->
     <modify-function signature="repaint()" remove="all"/>
@@ -2761,7 +2631,6 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QDesktopWidget"/>
   <object-type name="QFrame">
       <enum-type name="Shadow"/>
       <enum-type name="Shape"/>
@@ -2782,7 +2651,7 @@
     sys.exit(app.exec_())
           </inject-documentation>
       </modify-function>
-      <modify-function signature="valueChanged(QString)">
+      <modify-function signature="textChanged(QString)">
           <inject-documentation mode="append" format="target">
 ::
 
@@ -2943,20 +2812,8 @@
     </modify-function>
     <modify-function signature="print(QPagedPaintDevice*)const" rename="print_"/>
   </object-type>
-  <object-type name="QAction">
-    <enum-type name="ActionEvent"/>
-    <enum-type name="MenuRole"/>
-    <enum-type name="Priority" since="4.6"/>
-    <modify-function signature="setMenu(QMenu*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="triggered(bool)" allow-thread="yes"/>
-  </object-type>
 
   <object-type name="QApplication">
-    <enum-type name="ColorSpec"/>
     <extra-includes>
       <include file-name="QBasicTimer" location="global"/>
       <include file-name="QFont" location="global"/>