8 files changed, 9 insertions, 94 deletions
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp
index 0377f7697..bfaa9ff44 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside2/libpyside/globalreceiverv2.cpp
@@ -100,9 +100,6 @@ DynamicSlotDataV2::DynamicSlotDataV2(PyObject *callback, GlobalReceiverV2 *paren
         //Can not store calback pointe because this will be destroyed at the end of the scope
         //To avoid increment intance reference keep the callback information
         m_callback = PyMethod_GET_FUNCTION(callback);
-#ifndef IS_PY3K
-        m_pyClass = PyMethod_GET_CLASS(callback);
-#endif
         m_pythonSelf = PyMethod_GET_SELF(callback);
 
         //monitor class from method lifetime
@@ -140,11 +137,7 @@ PyObject *DynamicSlotDataV2::callback()
 
     //create a callback based on method data
     if (m_isMethod)
-#ifdef IS_PY3K
         callback = PyMethod_New(m_callback, m_pythonSelf);
-#else
-        callback = PyMethod_New(m_callback, m_pythonSelf, m_pyClass);
-#endif
     else
         Py_INCREF(callback);
 
@@ -283,11 +276,7 @@ int GlobalReceiverV2::refCount(const QObject *link) const
 
 void GlobalReceiverV2::notify()
 {
-#if QT_VERSION >= 0x050E00
     const QSet<const QObject *> objSet(m_refs.cbegin(), m_refs.cend());
-#else
-    const auto objSet = QSet<const QObject *>::fromList(m_refs);
-#endif
     Py_BEGIN_ALLOW_THREADS
     for (const QObject *o : objSet) {
         QMetaObject::disconnect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID);
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index 219b99d48..2404788d3 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -473,13 +473,11 @@ QString pyStringToQString(PyObject *str) {
     if (str == Py_None)
         return QString();
 
-#ifdef IS_PY3K
     if (PyUnicode_Check(str)) {
         const char *unicodeBuffer = _PepUnicode_AsString(str);
         if (unicodeBuffer)
             return QString::fromUtf8(unicodeBuffer);
     }
-#endif
     if (PyBytes_Check(str)) {
         const char *asciiBuffer = PyBytes_AS_STRING(str);
         if (asciiBuffer)
diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h
index c1a298cc8..e241ac74d 100644
--- a/sources/pyside2/libpyside/pyside.h
+++ b/sources/pyside2/libpyside/pyside.h
@@ -144,9 +144,11 @@ PYSIDE_API PyObject *getWrapperForQObject(QObject *cppSelf, SbkObjectType *sbk_t
 
 #ifdef PYSIDE_QML_SUPPORT
 // Used by QtQuick module to notify QtQml that custom QtQuick items can be registered.
-typedef bool (*QuickRegisterItemFunction)(PyObject *pyObj, const char *uri, int versionMajor,
-                                 int versionMinor, const char *qmlName,
-                                 QQmlPrivate::RegisterType *);
+using QuickRegisterItemFunction =
+    bool (*)(PyObject *pyObj, const char *uri, int versionMajor,
+             int versionMinor, const char *qmlName,
+             bool creatable, const char *noCreationReason,
+             QQmlPrivate::RegisterType *);
 PYSIDE_API QuickRegisterItemFunction getQuickRegisterItemFunction();
 PYSIDE_API void setQuickRegisterItemFunction(QuickRegisterItemFunction function);
 #endif // PYSIDE_QML_SUPPORT
@@ -169,4 +171,3 @@ PYSIDE_API bool registerInternalQtConf();
 
 
 #endif // PYSIDE_H
-
diff --git a/sources/pyside2/libpyside/pysidemetafunction.cpp b/sources/pyside2/libpyside/pysidemetafunction.cpp
index afb3dbb1a..0b7799af1 100644
--- a/sources/pyside2/libpyside/pysidemetafunction.cpp
+++ b/sources/pyside2/libpyside/pysidemetafunction.cpp
@@ -176,14 +176,14 @@ bool call(QObject *self, int methodIndex, PyObject *args, PyObject **retVal)
 
         Shiboken::Conversions::SpecificConverter converter(typeName);
         if (converter) {
-            int typeId = QMetaType::type(typeName);
+            int typeId = QMetaType::fromName(typeName).id();
             if (!Shiboken::Conversions::pythonTypeIsObjectType(converter)) {
                 if (!typeId) {
                     PyErr_Format(PyExc_TypeError, "Value types used on meta functions (including signals) need to be "
                                                   "registered on meta type: %s", typeName.data());
                     break;
                 }
-                methValues[i] = QVariant(typeId, static_cast<const void *>(0));
+                methValues[i] = QVariant(static_cast<QVariant::Type>(typeId));
             }
             methArgs[i] = methValues[i].data();
             if (i == 0) // Don't do this for return type
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index 8aaa81205..79464541d 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -139,17 +139,8 @@ static void qpropertyMetaCall(PySideProperty *pp, PyObject *self, QMetaObject::C
             break;
         }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        case QMetaObject::RegisterQPropertyObserver:
-        case QMetaObject::SetQPropertyBinding:
-#else
-        case QMetaObject::QueryPropertyDesignable:
-        case QMetaObject::QueryPropertyScriptable:
-        case QMetaObject::QueryPropertyStored:
-        case QMetaObject::QueryPropertyEditable:
-        case QMetaObject::QueryPropertyUser:
         // just to avoid gcc warnings
-#endif
+        case QMetaObject::BindableProperty:
         case QMetaObject::InvokeMetaMethod:
         case QMetaObject::CreateInstance:
         case QMetaObject::IndexOfMethod:
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp
index b141ce157..b07a73332 100644
--- a/sources/pyside2/libpyside/pysideqflags.cpp
+++ b/sources/pyside2/libpyside/pysideqflags.cpp
@@ -141,21 +141,13 @@ namespace PySide
 namespace QFlags
 {
     static PyType_Slot SbkNewQFlagsType_slots[] = {
-#ifdef IS_PY3K
         {Py_nb_bool, 0},
-#else
-        {Py_nb_nonzero, 0},
-        {Py_nb_long, 0},
-#endif
         {Py_nb_invert, 0},
         {Py_nb_and, 0},
         {Py_nb_xor, 0},
         {Py_nb_or, 0},
         {Py_nb_int, reinterpret_cast<void*>(qflag_int)},
         {Py_nb_index, reinterpret_cast<void*>(qflag_int)},
-#ifndef IS_PY3K
-        {Py_nb_long, 0},
-#endif
         {Py_tp_new, (void *)PySideQFlagsNew},
         {Py_tp_richcompare, (void *)PySideQFlagsRichCompare},
         {Py_tp_dealloc, (void *)Sbk_object_dealloc},
diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp
index 5c030316e..f3fb4e06d 100644
--- a/sources/pyside2/libpyside/pysidesignal.cpp
+++ b/sources/pyside2/libpyside/pysidesignal.cpp
@@ -227,13 +227,9 @@ static int signalTpInit(PyObject *self, PyObject *args, PyObject *kwds)
         Py_ssize_t argument_size = PySequence_Size(argArguments);
         for (Py_ssize_t i = 0; i < argument_size; ++i) {
             PyObject *item = PySequence_GetItem(argArguments, i);
-#ifdef IS_PY3K
             PyObject *strObj = PyUnicode_AsUTF8String(item);
             char *s = PyBytes_AsString(strObj);
             Py_DECREF(strObj);
-#else
-            char *s = PyBytes_AsString(item);
-#endif
             Py_DECREF(item);
             if (s != nullptr)
                 data->data->signalArguments->append(QByteArray(s));
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp
index 93847e066..0992cfcfd 100644
--- a/sources/pyside2/libpyside/signalmanager.cpp
+++ b/sources/pyside2/libpyside/signalmanager.cpp
@@ -66,9 +66,6 @@
     #include <private/qv4engine_p.h>
     #include <private/qv4context_p.h>
     #include <private/qqmldata_p.h>
-#if QT_VERSION < 0x050700
-        #include <private/qqmlcontextwrapper_p.h>
-#endif
 #endif
 
 #if QSLOT_CODE != 1 || QSIGNAL_CODE != 2
@@ -85,7 +82,6 @@ namespace {
     static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args);
     static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args);
 
-#ifdef IS_PY3K
     static void destroyMetaObject(PyObject *obj)
     {
         void *ptr = PyCapsule_GetPointer(obj, 0);
@@ -95,17 +91,6 @@ namespace {
             Shiboken::BindingManager::instance().releaseWrapper(wrapper);
         delete meta;
     }
-
-#else
-    static void destroyMetaObject(void *obj)
-    {
-        auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(obj);
-        SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta);
-        if (wrapper)
-            Shiboken::BindingManager::instance().releaseWrapper(wrapper);
-        delete meta;
-    }
-#endif
 }
 
 namespace PySide {
@@ -275,9 +260,6 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
 
     // Register PyObject type to use in queued signal and slot connections
     qRegisterMetaType<PyObjectWrapper>("PyObject");
-    qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObject");
-    qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObjectWrapper");
-    qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PySide::PyObjectWrapper");
 
     SbkConverter *converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, nullptr);
     Shiboken::Conversions::setCppPointerToPythonFunction(converter, PyObject_PTR_CppToPython_PyObject);
@@ -411,13 +393,6 @@ int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id,
         case QMetaObject::ReadProperty:
         case QMetaObject::WriteProperty:
         case QMetaObject::ResetProperty:
-#  if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        case QMetaObject::QueryPropertyDesignable:
-        case QMetaObject::QueryPropertyScriptable:
-        case QMetaObject::QueryPropertyStored:
-        case QMetaObject::QueryPropertyEditable:
-        case QMetaObject::QueryPropertyUser:
-#  endif // < Qt 6
             pp->d->metaCallHandler(pp, pySelf, call, args);
             break;
 #endif
@@ -456,15 +431,7 @@ int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id,
 
             if (data && !data->jsWrapper.isNullOrUndefined()) {
                 QV4::ExecutionEngine *engine = data->jsWrapper.engine();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                 if (engine->currentStackFrame != nullptr) {
-#elif QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-                if (engine->currentContext->d() != engine->rootContext()->d()) {
-#else
-                QV4::ExecutionContext *ctx = engine->currentContext();
-                if (ctx->type == QV4::Heap::ExecutionContext::Type_CallContext ||
-                    ctx->type == QV4::Heap::ExecutionContext::Type_SimpleCallContext) {
-#endif
                     PyObject *errType, *errValue, *errTraceback;
                     PyErr_Fetch(&errType, &errValue, &errTraceback);
                     // PYSIDE-464: The error is only valid before PyErr_Restore,
@@ -477,7 +444,6 @@ int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id,
 
                     PyErr_Print();    // Note: PyErr_Print clears the error.
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
                     if (isSyntaxError) {
                         return engine->throwSyntaxError(errString);
                     } else if (isTypeError) {
@@ -485,18 +451,9 @@ int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id,
                     } else {
                         return engine->throwError(errString);
                     }
-#else
-                    if (isSyntaxError) {
-                        return ctx->throwSyntaxError(errString);
-                    } else if (isTypeError) {
-                        return ctx->throwTypeError(errString);
-                    } else {
-                        return ctx->throwError(errString);
-                    }
-#endif
                 }
             }
-#endif
+#endif // PYSIDE_QML_PRIVATE_API_SUPPORT
 
             int reclimit = Py_GetRecursionLimit();
             // Inspired by Python's errors.c: PyErr_GivenExceptionMatches() function.
@@ -572,11 +529,7 @@ static MetaObjectBuilder *metaBuilderFromDict(PyObject *dict)
     // PyDict_GetItem would touch PyThreadState_GET and the global error state.
     // PyDict_GetItemWithError instead can work without GIL.
     PyObject *pyBuilder = PyDict_GetItemWithError(dict, metaObjectAttr);
-#ifdef IS_PY3K
     return reinterpret_cast<MetaObjectBuilder *>(PyCapsule_GetPointer(pyBuilder, nullptr));
-#else
-    return reinterpret_cast<MetaObjectBuilder *>(PyCObject_AsVoidPtr(pyBuilder));
-#endif
 }
 
 int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signature, QMetaMethod::MethodType type)
@@ -602,12 +555,7 @@ int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signa
             // Create a instance meta object
             if (!dmo) {
                 dmo = new MetaObjectBuilder(Py_TYPE(pySelf), metaObject);
-#ifdef IS_PY3K
                 PyObject *pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject);
-#else
-                PyObject *pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject);
-#endif
-
                 PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo);
                 Py_DECREF(pyDmo);
             }