diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-05 09:10:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-05 12:56:41 +0100 |
| commit | f3139399b273fdf405f20cba32a08262cd933d6e (patch) | |
| tree | deed895170c12f8478af44a73b23b63b75239957 /sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | |
| parent | 2b94776295e1d9f882096b4f2c7ca0a93a20b20c (diff) | |
| parent | b57c557c8cd1012851f8a245075591dc33be425b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I452d3a0a04e282b678879132ca1b3a272910ef04
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 12b0f3115..0f6d48968 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1731,6 +1731,9 @@ <modify-argument index="return"> <replace-type modified-type="QString"/> </modify-argument> + <inject-code class="native" position="end"> + <insert-template name="return_QString_native"/> + </inject-code> <inject-code class="target" position="end"> <insert-template name="return_QString"/> </inject-code> |