Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I47521e21977b1f17fcc65590f565270b2440a48b

1 files changed, 10 insertions, 5 deletions

diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
index 83e88c331..3c17f8bf8 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
@@ -51,6 +51,7 @@
 #include <sstream>
 #include <algorithm>
 #include "threadstatesaver.h"
+#include "signature.h"
 
 namespace {
     void _destroyParentInfo(SbkObject* obj, bool keepReference);
@@ -721,10 +722,12 @@ void initPrivateData(SbkObjectType* self)
     memset(self->d, 0, sizeof(SbkObjectTypePrivate));
 }
 
-bool introduceWrapperType(PyObject* enclosingObject,
-                          const char* typeName, const char* originalName,
-                          SbkObjectType* type, ObjectDestructor cppObjDtor,
-                          SbkObjectType* baseType, PyObject* baseTypes,
+bool introduceWrapperType(PyObject *enclosingObject,
+                          const char *typeName, const char *originalName,
+                          SbkObjectType *type,
+                          const char *signaturesString,
+                          ObjectDestructor cppObjDtor,
+                          SbkObjectType *baseType, PyObject *baseTypes,
                           bool isInnerClass)
 {
     initPrivateData(type);
@@ -742,7 +745,9 @@ bool introduceWrapperType(PyObject* enclosingObject,
         }
     }
 
-    if (PyType_Ready(reinterpret_cast<PyTypeObject *>(type)) < 0)
+    // PySide-510
+    // here is the single change to support signatures.
+    if (SbkSpecial_Type_Ready(enclosingObject, reinterpret_cast<PyTypeObject *>(type), signaturesString) < 0)
         return false;
 
     if (isInnerClass)