diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-31 13:40:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-01 05:32:25 +0000 |
| commit | 7ac8da6adee7528578ec800bf810ea69ac746043 (patch) | |
| tree | dd2a1d6eadd0f70edccb5b68ce495759e80ff350 /sources/pyside2/PySide2/glue | |
| parent | 404f584d6ac4b94c65d60aa1171f0ef1fe4dc6bd (diff) | |
Adapt to recent Qt 6 changes
- Removal of the statemachine framework from QtCore
- Addition of QAbstractFileIconProvider
- Adapt some signatures
- QMetaType deprecations
Change-Id: Ia51354542ad1d2f0bb5530e45ebef0d6ccdb633d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/glue')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 8d25907d6..1dac1ec3a 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -148,7 +148,7 @@ static const char *QVariant_resolveMetaType(PyTypeObject *type, int *typeId) // Do not convert user type of value if (valueType && Shiboken::ObjectType::isUserType(type)) return nullptr; - int obTypeId = QMetaType::type(typeName); + int obTypeId = QMetaType::fromName(typeName).id(); if (obTypeId) { *typeId = obTypeId; return typeName; @@ -190,7 +190,7 @@ static QVariant QVariant_convertToValueList(PyObject *list) QByteArray listTypeName("QList<"); listTypeName += typeName; listTypeName += '>'; - typeId = QMetaType::type(listTypeName); + typeId = QMetaType::fromName(listTypeName).id(); if (typeId > 0) { Shiboken::Conversions::SpecificConverter converter(listTypeName); if (converter) { @@ -1820,15 +1820,18 @@ else if (Py_TYPE(%in) == SbkObjectType_TypeF()) typeName = Shiboken::ObjectType::getOriginalName((SbkObjectType *)%in); else typeName = reinterpret_cast<PyTypeObject *>(%in)->tp_name; -%out = QVariant::nameToType(typeName); +const int id = QMetaType::fromName(typeName).id(); +%out = QVariant::Type(id); // @snippet conversion-qvariant-pytypeobject // @snippet conversion-qvariant-pystring -%out = QVariant::nameToType(Shiboken::String::toCString(%in)); +const int id = QMetaType::fromName(Shiboken::String::toCString(%in)).id(); +%out = QVariant::Type(id); // @snippet conversion-qvariant-pystring // @snippet conversion-qvariant-pydict -%out = QVariant::nameToType("QVariantMap"); +const int id = QMetaType::fromName("QVariantMap").id(); +%out = QVariant::Type(id); // @snippet conversion-qvariant-pydict // @snippet conversion-qvariant-pysequence @@ -1951,7 +1954,7 @@ return 0; // @snippet return-qvariant // @snippet return-qvariant-type -const char *typeName = QVariant::typeToName(%in); +const char *typeName = QMetaType(%in).name(); PyObject *%out; PyTypeObject *pyType = nullptr; if (typeName) |