diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 16:11:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 16:11:09 +0200 |
| commit | 704d3aab0f25d6b0d2939f1bb4e95ca73861ca9c (patch) | |
| tree | 69680c1ce0a1a296aa1ed78fdbff30f583172e67 /sources/pyside2/libpyside/dynamicqmetaobject.cpp | |
| parent | d6d31c5c277d30080a6b92de3774460048dcf49e (diff) | |
| parent | fedc289138bd912384e71a91e49ef9ee7b8a0fbb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib1d2c1b76a043526e8f715e45296104cad085a4a
Diffstat (limited to 'sources/pyside2/libpyside/dynamicqmetaobject.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/dynamicqmetaobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp index efdf33ac9..2fbda3f6a 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp @@ -533,7 +533,8 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) const int index = m_baseObject->indexOfProperty(String::toCString(key)); if (index == -1) addProperty(String::toCString(key), value); - } else if (PyFunction_Check(value)) { + } else if (Py_TYPE(value)->tp_call != nullptr) { + // PYSIDE-198: PyFunction_Check does not work with Nuitka. // Register slots. if (PyObject_HasAttr(value, slotAttrName)) { PyObject *signatureList = PyObject_GetAttr(value, slotAttrName); |