diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-19 11:55:10 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-03 15:40:57 +0000 |
commit | ceeb82693a0240b1dd4f51605ba21413927ee558 (patch) | |
tree | 8363fe26b1f00823ff0b8f4c2d7af38bc3e4d087 /sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp | |
parent | 0eec9fecd241a178ca8f09218b9286ae763f29b3 (diff) |
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>
Diffstat (limited to 'sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp')
-rw-r--r-- | sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
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; |