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>

3 files changed, 13 insertions, 22 deletions

diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
index 0f453c90e..25f54679f 100644
--- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt
@@ -3,10 +3,12 @@ project(QtQuick)
 set(QtQuick_registerType "${QtQuick_SOURCE_DIR}/pysidequickregistertype.cpp")
 
 set(QtQuick_SRC
+${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickframebufferobject_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickframebufferobject_renderer_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquicktexturefactory_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickimageprovider_wrapper.cpp
+${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquicktransform_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickitem_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickitem_updatepaintnodedata_wrapper.cpp
@@ -17,11 +19,9 @@ ${QtQuick_GEN_DIR}/qquickrendercontrol_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquicktextdocument_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickview_wrapper.cpp
 ${QtQuick_GEN_DIR}/qquickwindow_wrapper.cpp
-${QtQuick_GEN_DIR}/qsgabstractrenderer_wrapper.cpp
 ${QtQuick_GEN_DIR}/qsgbasicgeometrynode_wrapper.cpp
 ${QtQuick_GEN_DIR}/qsgclipnode_wrapper.cpp
 ${QtQuick_GEN_DIR}/qsgdynamictexture_wrapper.cpp
-${QtQuick_GEN_DIR}/qsgengine_wrapper.cpp
 #${QtQuick_GEN_DIR}/qsgflatcolormaterial_wrapper.cpp
 ${QtQuick_GEN_DIR}/qsggeometry_attribute_wrapper.cpp
 ${QtQuick_GEN_DIR}/qsggeometry_attributeset_wrapper.cpp
@@ -51,13 +51,6 @@ ${QtQuick_GEN_DIR}/qsgtransformnode_wrapper.cpp
 ${QtQuick_GEN_DIR}/qtquick_module_wrapper.cpp
 )
 
-if (Qt${QT_MAJOR_VERSION}Quick_VERSION VERSION_GREATER 5.5.1)
-    set(QtQuick_SRC ${QtQuick_SRC}
-                    ${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp
-                    ${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp
-       )
-endif()
-
 set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
                           ${QtQml_SOURCE_DIR}
                           ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
diff --git a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
index a042ac2cc..8e48c3d7f 100644
--- a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
+++ b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
@@ -130,6 +130,7 @@ void registerTypeIfInheritsFromClass(
     bool shouldRegister = !registered && pyTypeObjectInheritsFromClass(typeToRegister, className);
     if (shouldRegister) {
         int ptrType =
+#if 0 // FIXME Qt 6
                 QMetaType::registerNormalizedType(
                     typePointerName.constData(),
                     QtMetaTypePrivate::QMetaTypeFunctionHelper<WrapperClass *>::Destruct,
@@ -143,8 +144,11 @@ void registerTypeIfInheritsFromClass(
                          typePointerName.constData());
             return;
         }
-
+#else
+                -1;
+#endif
         int lstType =
+#if 0 // FIXME Qt 6
                 QMetaType::registerNormalizedType(
                     typeListName.constData(),
                     QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<WrapperClass> >
@@ -155,14 +159,17 @@ void registerTypeIfInheritsFromClass(
                     static_cast< ::QFlags<QMetaType::TypeFlag> >(
                         QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags),
                     nullptr);
+#else
+                -1;
+#endif
         if (lstType == -1) {
             PyErr_Format(PyExc_TypeError, "Meta type registration of \"%s\" for QML usage failed.",
                          typeListName.constData());
             return;
         }
 
-        type->typeId = ptrType;
-        type->listId = lstType;
+        type->typeId = QMetaType(ptrType);
+        type->listId = QMetaType(lstType);
         type->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc<WrapperClass>();
         type->attachedPropertiesMetaObject =
                 QQmlPrivate::attachedPropertiesMetaObject<WrapperClass>();
@@ -228,10 +235,8 @@ bool quickRegisterType(PyObject *pyObj, const char *uri, int versionMajor, int v
         return false;
 
     type->create = createFuncs[nextType];
-    type->version = 0;
     type->uri = uri;
-    type->versionMajor = versionMajor;
-    type->versionMinor = versionMinor;
+    type->version = QTypeRevision::fromVersion(versionMajor, versionMinor);
     type->elementName = qmlName;
     type->metaObject = metaObject;
 
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 223eff773..31e05979b 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -107,16 +107,9 @@
         <enum-type name="TextRenderType" since="5.10"/>
     </object-type>
 
-    <object-type name="QSGAbstractRenderer">
-        <enum-type name="ClearModeBit" flags="ClearMode"/>
-        <enum-type name="MatrixTransformFlag" flags="MatrixTransformFlags" since="5.14"/>
-    </object-type>
     <object-type name="QSGBasicGeometryNode"/>
     <object-type name="QSGClipNode"/>
     <object-type name="QSGDynamicTexture"/>
-    <object-type name="QSGEngine">
-        <enum-type name="CreateTextureOption" flags="CreateTextureOptions"/>
-    </object-type>
     <!-- <object-type name="QSGFlatColorMaterial"/> -->
     <object-type name="QSGGeometry">
         <enum-type name="DataPattern"/>