diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
| commit | 25f899e276c00b8d7f334819d6cd7927ed67093a (patch) | |
| tree | d2a063aab76e0435eb862ca5d2b541a5e718f062 /sources/pyside2/PySide2/typesystem_templates.xml | |
| parent | 4725008aeea407ae55cfd66de802dd9e06412efc (diff) | |
| parent | e30e0c161b2b4d50484314bf006e9e5e8ff6b380 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938
Diffstat (limited to 'sources/pyside2/PySide2/typesystem_templates.xml')
| -rw-r--r-- | sources/pyside2/PySide2/typesystem_templates.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml index d9258ba88..7ac4ac158 100644 --- a/sources/pyside2/PySide2/typesystem_templates.xml +++ b/sources/pyside2/PySide2/typesystem_templates.xml @@ -297,13 +297,7 @@ PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG5_TYPE](%5)); </template> - <template name="set_qapp_parent_for_orphan"> - if (%PYARG_0 && (%PYARG_0 != Py_None)) { - SbkObject* _pySelf = reinterpret_cast<SbkObject*>(%PYARG_0); - if (!Shiboken::Object::hasParentInfo(_pySelf)) - Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0); - } - </template> + <!-- templates for __repr__ --> <template name="repr_code"> QString format = QString().sprintf("%s(%REPR_FORMAT)", ((PyObject*)%PYSELF)->ob_type->tp_name, %REPR_ARGS); |