diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-02 13:55:01 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-02 13:55:01 +0100 |
| commit | 4b2ef72f0461fbce539d6a1bd69d8c0ed7041025 (patch) | |
| tree | 6b311ffa86655f7c27aca88df59d125070bc32fb /sources/pyside2/PySide2/QtWidgets | |
| parent | a5bc27c463f40f6c984f99f81bb05e46699c7df1 (diff) | |
| parent | a18e81dd1311811eb1227cf46d253ae647a9fbdd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I777970f7bb17db766660d82556559eadd7293355
Diffstat (limited to 'sources/pyside2/PySide2/QtWidgets')
| -rw-r--r-- | sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 92ff3c08b..d0c4877f2 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -2526,10 +2526,13 @@ </modify-function> <modify-function signature="clear()"> <inject-code class="target" position="beginning"> + Shiboken::BindingManager& bm = Shiboken::BindingManager::instance(); for (int i = 0; i < %CPPSELF.count(); i++) { QWidget* widget = %CPPSELF.widget(i); - Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](widget)); - Shiboken::Object::setParent(0, pyWidget); + if (bm.hasWrapper(widget)) { + Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](widget)); + Shiboken::Object::releaseOwnership(pyWidget); + } } %CPPSELF.%FUNCTION_NAME(); </inject-code> |