diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-02-19 12:42:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-02-20 09:17:11 +0100 |
| commit | b59ccba17fd448b679936db70ba026f898e5554c (patch) | |
| tree | ec851fe3cdc67e7393abc513254a673f141dd632 /sources/pyside6/PySide6/QtOpenGL | |
| parent | cab7ca5fd2d5966d1d8f8b8057bd71da19ca7777 (diff) | |
Remove XML template typesystem file opengl_common.xml
Use the existing code snippet for glGetString.
callArrayFunction appears to be unused.
Pick-to: 6.8
Change-Id: I7eeff9866bc7b4eb6e0f9bb409ae0382723c96c4
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtOpenGL')
| -rw-r--r-- | sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index efbd16056..f6afdf83c 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -7,7 +7,6 @@ namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> - <load-typesystem name="templates/opengl_common.xml" generate="no" /> <rejection class="^QOpenGL.*$" argument-type="^const GLboolean ?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml index 152efad9e..ef6c9a0e5 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl_modifications1_0.xml @@ -6,9 +6,7 @@ <modify-argument index="return"> <replace-type modified-type="QString"/> </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="glGetString_return_QString"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="glgetstring-return"/> </modify-function> <modify-function signature="^glTexParameterI?u?[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> |