diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-24 08:50:12 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-24 08:50:12 +0200 |
commit | d9aed0193b47664af5ec6b92f99fe8cca7f94246 (patch) | |
tree | c1aa628b681ef5c8d924e33194b90f8804dcf9e5 /sources/pyside2/libpyside | |
parent | b45a890df5bb26c3a4feb8d57dd994fdaaf9c750 (diff) | |
parent | b5a574eaeeb6a4f30794e6012b96f05a3de49217 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ide71a89ef173d6f3e1fa6960f7b15f1fd6cc1bf1
Diffstat (limited to 'sources/pyside2/libpyside')
-rw-r--r-- | sources/pyside2/libpyside/pysidesignal.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp index f3ba84d3b..2d423a634 100644 --- a/sources/pyside2/libpyside/pysidesignal.cpp +++ b/sources/pyside2/libpyside/pysidesignal.cpp @@ -352,8 +352,6 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds) if (isMethod || isFunction) { PyObject *function = isMethod ? PyMethod_GET_FUNCTION(slot) : slot; PyCodeObject *objCode = reinterpret_cast<PyCodeObject *>(PyFunction_GET_CODE(function)); - PyFunctionObject *function_obj = reinterpret_cast<PyFunctionObject *>(function); - functionName = Shiboken::String::toCString(PepFunction_GetName(function_obj)); useSelf = isMethod; slotArgs = PepCode_GET_FLAGS(objCode) & CO_VARARGS ? -1 : PepCode_GET_ARGCOUNT(objCode); if (useSelf) |