diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:58:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:59:22 +0200 |
| commit | 2c3cbe854f921068346ee78f7dda841116230ede (patch) | |
| tree | acb00b4202ffaab3b565348a530f3ae0f919a555 /sources/pyside2/libpyside/pyside.cpp | |
| parent | 0cf22cc9f74594252bd744d6aee77cd3ee3ae0e8 (diff) | |
| parent | e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
Diffstat (limited to 'sources/pyside2/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index cb6f0721f..d6f4e5a37 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -309,10 +309,10 @@ PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* nam bool inherits(PyTypeObject* objType, const char* class_name) { - if (strcmp(PepType(objType)->tp_name, class_name) == 0) + if (strcmp(objType->tp_name, class_name) == 0) return true; - PyTypeObject* base = PepType(objType)->tp_base; + PyTypeObject* base = objType->tp_base; if (base == 0) return false; |