diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:58:53 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:59:22 +0200 |
commit | 2c3cbe854f921068346ee78f7dda841116230ede (patch) | |
tree | acb00b4202ffaab3b565348a530f3ae0f919a555 /sources/pyside2/PySide2/QtScript/typesystem_script.xml | |
parent | 0cf22cc9f74594252bd744d6aee77cd3ee3ae0e8 (diff) | |
parent | e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
Diffstat (limited to 'sources/pyside2/PySide2/QtScript/typesystem_script.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtScript/typesystem_script.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtScript/typesystem_script.xml b/sources/pyside2/PySide2/QtScript/typesystem_script.xml index dc089a300..d2d3e3182 100644 --- a/sources/pyside2/PySide2/QtScript/typesystem_script.xml +++ b/sources/pyside2/PySide2/QtScript/typesystem_script.xml @@ -85,11 +85,11 @@ <inject-code class="target" position="beginning"> if (%CPPSELF.isVariant() || %CPPSELF.isString()) { QString format = QString().sprintf("%s(\"%s\")", - PepType(Py_TYPE(%PYSELF))->tp_name, + Py_TYPE(%PYSELF)->tp_name, qPrintable(%CPPSELF.toString())); %PYARG_0 = Shiboken::String::fromCString(qPrintable(format)); } else { - %PYARG_0 = Shiboken::String::fromCString(PepType(Py_TYPE(%PYSELF))->tp_name); + %PYARG_0 = Shiboken::String::fromCString(Py_TYPE(%PYSELF)->tp_name); } </inject-code> </add-function> |