diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-01 13:23:44 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-01 13:23:48 +0200 |
commit | e4e72eae189e57c255193aa8ee556a3d9936d110 (patch) | |
tree | 56c79d8d75479d71d341f5682531fdbd11f6ec95 /sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp | |
parent | 6383820c4b32395fe6dfead79f38ff93b7a0e686 (diff) | |
parent | ae0aa898a3bc1701499ff7993c8d31bc86eb1675 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I31a0ff26bc02e6cc2ec2a816c16d170fc334f800
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp')
-rw-r--r-- | sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp b/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp index 6a997c852..f1d5a6bfc 100644 --- a/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp +++ b/sources/pyside2/PySide2/QtCore/glue/qbytearray_mgetitem.cpp @@ -82,6 +82,6 @@ if (PyIndex_Check(_key)) { } else { PyErr_Format(PyExc_TypeError, "list indices must be integers or slices, not %.200s", - _key->ob_type->tp_name); + PepType((Py_TYPE(_key)))->tp_name); return NULL; } |