diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-09-21 13:36:21 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-21 16:51:40 +0200 |
| commit | 00228b7605f63c58ab979362ecaa2bef96c7dc67 (patch) | |
| tree | c8758b4771f8e9c595c7630f2e017cf0c0be0a34 | |
| parent | f6e8ba7e9861e29dbd995d984accc79e96a10388 (diff) | |
Fix QSurfaceDataProxy::resetArray() crash
Pass an allocated array to the function.
Complements dd4d4fe1ee74cc6dae370a8a9dcced53dc9a3898.
Task-number: PYSIDE-1438
Change-Id: I4120a0dbeb3a4a4a740125ba9c27f78e61875457
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml | 7 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtdatavisualization.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml index 66f0784e8..11f89cf8a 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml @@ -287,11 +287,14 @@ snippet="dataproxy-setrow"/> </add-function> - <modify-function signature="resetArray(QSurfaceDataArray*)"> + <modify-function signature="resetArray(QSurfaceDataArray*)" remove="all"/> + <add-function signature="resetArray(const QSurfaceDataArray&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-resetarray"/> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> - </modify-function> + </add-function> </object-type> <object-type name="Q3DBars"> <modify-function signature="addAxis(QAbstract3DAxis*)"> diff --git a/sources/pyside6/PySide6/glue/qtdatavisualization.cpp b/sources/pyside6/PySide6/glue/qtdatavisualization.cpp index b22340801..21c8eb23f 100644 --- a/sources/pyside6/PySide6/glue/qtdatavisualization.cpp +++ b/sources/pyside6/PySide6/glue/qtdatavisualization.cpp @@ -77,3 +77,8 @@ using ListType = decltype(%2); using ListType = decltype(%2); %CPPSELF.setRow(%1, new ListType(%2), %3); // @snippet dataproxy-setrow-string +// +// @snippet dataproxy-resetarray +using ListType = decltype(%1); +%CPPSELF.resetArray(new ListType(%1)); +// @snippet dataproxy-resetarray |