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/typesystem_templates.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/typesystem_templates.xml')
-rw-r--r-- | sources/pyside2/PySide2/typesystem_templates.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml index 1715c0253..11a384263 100644 --- a/sources/pyside2/PySide2/typesystem_templates.xml +++ b/sources/pyside2/PySide2/typesystem_templates.xml @@ -286,6 +286,12 @@ <template name="return_QString"> %PYARG_0 = %CONVERTTOPYTHON[QString](%1); </template> + <template name="return_QString_native"> + if (%ISCONVERTIBLE[QString](%PYARG_0)) + %1 = %CONVERTTOCPP[QString](%PYARG_0); + else + qWarning("%TYPE::%FUNCTION_NAME: Argument is not convertible to unicode."); + </template> <template name="return_tuple_QValidator_QString_int"> %BEGIN_ALLOW_THREADS |