diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-29 14:10:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-29 14:15:29 +0100 |
| commit | d15a65c93717b8e69352a19dd81c3b08adcef996 (patch) | |
| tree | ec8feeb40061b7ddf4f40e38cece9fe67e4957ec /sources/pyside2/PySide2/QtQml | |
| parent | f4a6d74852b0ba6711195a9c3fc9356e677a3409 (diff) | |
| parent | 6978325323208c395d135f19847a8ad0b13f93f9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I3bb491686968e81382c135ab737da259d9796f52
Diffstat (limited to 'sources/pyside2/PySide2/QtQml')
| -rw-r--r-- | sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp index 5f13497ea..9d9ddc799 100644 --- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp +++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp @@ -235,7 +235,7 @@ void propListTpFree(void* self) static PyType_Slot PropertyListType_slots[] = { {Py_tp_init, (void *)propListTpInit}, {Py_tp_free, (void *)propListTpFree}, - {Py_tp_dealloc, (void *)SbkDummyDealloc}, + {Py_tp_dealloc, (void *)object_dealloc}, {0, 0} }; static PyType_Spec PropertyListType_spec = { @@ -449,7 +449,7 @@ static PyType_Slot QtQml_VolatileBoolType_slots[] = { {Py_tp_str, (void *)reinterpret_cast<reprfunc>(QtQml_VolatileBoolObject_str)}, {Py_tp_methods, (void *)QtQml_VolatileBoolObject_methods}, {Py_tp_new, (void *)QtQml_VolatileBoolObject_new}, - {Py_tp_dealloc, (void *)SbkDummyDealloc}, + {Py_tp_dealloc, (void *)object_dealloc}, {0, 0} }; static PyType_Spec QtQml_VolatileBoolType_spec = { |