diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 12:59:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 13:26:37 +0100 |
| commit | 06e4edac7133d322fe3398502396e1cd8afd8329 (patch) | |
| tree | ba4427a92c4f1eac1963a428a03edf2c0cea4248 /sources/pyside2/PySide2/QtScript | |
| parent | f2063ee4737f90c5d412a9a328672fde32b033eb (diff) | |
| parent | 764498b3d033a1c947a40dc1b2237e81b674992b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I72583df407fc5b3caa8bf35fd997889a4ac86512
Diffstat (limited to 'sources/pyside2/PySide2/QtScript')
| -rw-r--r-- | sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp | 3 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtScript/typesystem_script.xml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp b/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp new file mode 100644 index 000000000..fd9cd84a3 --- /dev/null +++ b/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp @@ -0,0 +1,3 @@ +%PYARG_0 = Shiboken::Object::newObject( + reinterpret_cast<SbkObjectType*>(Shiboken::SbkType< ::QScriptValueIterator >()), + new QScriptValueIterator(*%CPPSELF), true, true); diff --git a/sources/pyside2/PySide2/QtScript/typesystem_script.xml b/sources/pyside2/PySide2/QtScript/typesystem_script.xml index 4c7d7fab5..4467f1de9 100644 --- a/sources/pyside2/PySide2/QtScript/typesystem_script.xml +++ b/sources/pyside2/PySide2/QtScript/typesystem_script.xml @@ -106,9 +106,7 @@ </inject-code> </add-function> <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code> - %PYARG_0 = Shiboken::createWrapper(new QScriptValueIterator(*%CPPSELF), true, true); - </inject-code> + <inject-code file="qscript_value_iterator_glue.cpp" /> </add-function> </value-type> <object-type name="QScriptValueIterator"> |