diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-04 13:41:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-04 13:41:21 +0000 |
| commit | 46ff21ee14e00b992b49562943274d62f2b5b456 (patch) | |
| tree | 5d3bd74a8866956214ee217568f16058252c6e62 /sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp | |
| parent | 1e081edc4df56856470208443428a11b3cdfede3 (diff) | |
| parent | 2ef6a7a4d4f26956c2747c097973deec85b1d484 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp')
| -rw-r--r-- | sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp b/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp index 7c20b9b58..8e351cedd 100644 --- a/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp +++ b/sources/shiboken2/libshiboken/tmp-referencetopython/sbkconverter.cpp @@ -180,7 +180,7 @@ void pythonToCppPointer(SbkObjectType* type, PyObject* pyIn, void* cppOut) { assert(pyIn); assert(cppOut); - SbkObjectType* inType = (SbkObjectType*)pyIn->ob_type; + SbkObjectType* inType = (SbkObjectType*)Py_TYPE(pyIn); if (ObjectType::hasCast(inType)) *((void**)cppOut) = ObjectType::cast(inType, (SbkObject*)pyIn, (PyTypeObject*)type); else |