diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-29 18:25:42 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-29 18:25:42 +0000 |
| commit | 6e2741e3e38c09a014efc9cb0079ef942ff54626 (patch) | |
| tree | 65e4176a93fe331409e6f0cd68da74c917316caa /sources/pyside2/libpyside/pysideqflags.cpp | |
| parent | d650bf05013f10a3e8de73f061e9a725609e5e65 (diff) | |
| parent | d15a65c93717b8e69352a19dd81c3b08adcef996 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'sources/pyside2/libpyside/pysideqflags.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysideqflags.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp index f948ecac7..cb57031b0 100644 --- a/sources/pyside2/libpyside/pysideqflags.cpp +++ b/sources/pyside2/libpyside/pysideqflags.cpp @@ -152,7 +152,7 @@ namespace QFlags #endif {Py_tp_new, (void *)PySideQFlagsNew}, {Py_tp_richcompare, (void *)PySideQFlagsRichCompare}, - {Py_tp_dealloc, (void *)SbkDummyDealloc}, + {Py_tp_dealloc, (void *)object_dealloc}, {0, 0} }; static PyType_Spec SbkNewQFlagsType_spec = { |