diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 10:59:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-24 10:59:56 +0000 |
| commit | bbbcc44789a2206c85836fc9656389d00ca7e010 (patch) | |
| tree | 348eda42a7fd8bf9be05e23922ce6a550454014c /sources/pyside2/libpyside/pysideclassinfo.cpp | |
| parent | 4a6ecfc1b66252e75e75c6de982ef68e057b625e (diff) | |
| parent | 2c3cbe854f921068346ee78f7dda841116230ede (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'sources/pyside2/libpyside/pysideclassinfo.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysideclassinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp index 5e0ffed39..24a0c642b 100644 --- a/sources/pyside2/libpyside/pysideclassinfo.cpp +++ b/sources/pyside2/libpyside/pysideclassinfo.cpp @@ -127,7 +127,7 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */) static PyObject *classInfoTpNew(PyTypeObject *subtype, PyObject * /* args */, PyObject * /* kwds */) { - PySideClassInfo* me = reinterpret_cast<PySideClassInfo*>(PepType(subtype)->tp_alloc(subtype, 0)); + PySideClassInfo* me = reinterpret_cast<PySideClassInfo*>(subtype->tp_alloc(subtype, 0)); me->d = new PySideClassInfoPrivate; me->d->m_alreadyWrapped = false; @@ -170,7 +170,7 @@ void classInfoFree(void *self) PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self); delete data->d; - PepType(PepType(Py_TYPE(pySelf))->tp_base)->tp_free(self); + Py_TYPE(pySelf)->tp_base->tp_free(self); } |