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/shiboken2/tests/samplebinding/typesystem_sample.xml | |
| parent | 4725008aeea407ae55cfd66de802dd9e06412efc (diff) | |
| parent | e30e0c161b2b4d50484314bf006e9e5e8ff6b380 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938
Diffstat (limited to 'sources/shiboken2/tests/samplebinding/typesystem_sample.xml')
| -rw-r--r-- | sources/shiboken2/tests/samplebinding/typesystem_sample.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index efc4205ae..e0085abbe 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -1697,7 +1697,7 @@ <inject-code class="target" position="beginning"> int argc; char** argv; - if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &argc, &argv)) { + if (!Shiboken::listToArgcArgv(%PYARG_1, &argc, &argv)) { PyErr_SetString(PyExc_TypeError, "error"); return 0; } @@ -1720,7 +1720,7 @@ <inject-code class="target" position="beginning"> int argc; char** argv; - if (!Shiboken::sequenceToArgcArgv(%PYARG_1, &argc, &argv)) { + if (!Shiboken::listToArgcArgv(%PYARG_1, &argc, &argv)) { PyErr_SetString(PyExc_TypeError, "error"); return 0; } @@ -2412,7 +2412,7 @@ <value-type name="ValueAndVirtual" /> <object-type name="ObjectTypeByValue" /> - + <object-type name="TemplatePtr"> <modify-function signature="dummy(std::list<std::pair<BlackBox *, BlackBox *> > &)" rename="dummy_method" /> </object-type> |