diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:06 +0100 |
| commit | da5b3470a0ce57f8441485c7b146cdb3c1d2f331 (patch) | |
| tree | 030a47ff04145b05eb8160575243a73230dc24a0 /sources/pyside2/libpyside/pysidemetafunction.cpp | |
| parent | d0fbcc90bd02090f921313dafecba20065fb2eb5 (diff) | |
| parent | 37a1e27d49a6a1f7e45621e93a0f13a63fb20d9e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I779defc33a4bab15cfde1e276d6d78c476a47e0f
Diffstat (limited to 'sources/pyside2/libpyside/pysidemetafunction.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysidemetafunction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysidemetafunction.cpp b/sources/pyside2/libpyside/pysidemetafunction.cpp index e0e0c439b..637aa0598 100644 --- a/sources/pyside2/libpyside/pysidemetafunction.cpp +++ b/sources/pyside2/libpyside/pysidemetafunction.cpp @@ -62,7 +62,7 @@ static PyType_Slot PySideMetaFunctionType_slots[] = { {Py_tp_call, (void *)functionCall}, {Py_tp_new, (void *)PyType_GenericNew}, {Py_tp_free, (void *)functionFree}, - {Py_tp_dealloc, (void *)object_dealloc}, + {Py_tp_dealloc, (void *)Sbk_object_dealloc}, {0, 0} }; static PyType_Spec PySideMetaFunctionType_spec = { |