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/shiboken2/tests/samplebinding | |
parent | 0cf22cc9f74594252bd744d6aee77cd3ee3ae0e8 (diff) | |
parent | e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
Diffstat (limited to 'sources/shiboken2/tests/samplebinding')
-rw-r--r-- | sources/shiboken2/tests/samplebinding/typesystem_sample.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index a55c4fe1e..bef433784 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -1666,7 +1666,7 @@ Tested in InjectCodeTest.testTypeNativeBeginning_TypeTargetBeginning: --> <inject-code class="target" position="beginning"> - PepType(&%PYTHONTYPEOBJECT)->tp_str = InjectCode_tpstr; + %PYTHONTYPEOBJECT.tp_str = InjectCode_tpstr; </inject-code> <!-- Tested in InjectCodeTest.testFunctionTargetBeginning_FunctionTargetEnd --> @@ -2178,7 +2178,7 @@ </add-function> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> - ByteArray b(PepType(Py_TYPE(%PYSELF))->tp_name); + ByteArray b(Py_TYPE(%PYSELF)->tp_name); PyObject* aux = Shiboken::String::fromStringAndSize(%CPPSELF.data(), %CPPSELF.size()); if (PyUnicode_CheckExact(aux)) { PyObject* tmp = PyUnicode_AsASCIIString(aux); |