diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-08-25 09:26:03 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-25 16:26:07 +0000 |
| commit | 6e583332be28b931a3827b348cbb788692550fbe (patch) | |
| tree | 9eb1fa6486cf58efaa77317ca4acf8cd2ac3e21a | |
| parent | e0e97d60b4e8270d2ae2fdbd424f683d4491f2a4 (diff) | |
Prospective fix for OpenGL types on macOS
macOS has
typedef uint32_t GLuint;
typedef int32_t GLint;
Add those types (C++11/C).
Fixes: PYSIDE-1646
Change-Id: I7cd857ed06fee9925250964bdcdd93c42a251e34
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 901c2bdc12f4d5ce25c9b05a23915447fcc037d7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
3 files changed, 18 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 53ba2f254..0166f19cc 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -207,6 +207,14 @@ <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type --> <include file-name="signalmanager.h" location="global"/> </primitive-type> + <primitive-type name="int8_t"/> + <primitive-type name="uint8_t"/> + <primitive-type name="int16_t"/> + <primitive-type name="uint16_t"/> + <primitive-type name="int32_t"/> + <primitive-type name="uint32_t"/> + <primitive-type name="int64_t"/> + <primitive-type name="uint64_t"/> <primitive-type name="bool" target-lang-api-name="PyBool"> <conversion-rule> diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index 34f22f2ca..b01967c54 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -104,6 +104,8 @@ <rejection class="^QOpenGL.*$" argument-type="^(const )?char ?\*\*$"/> <rejection class="^QOpenGL.*$" argument-type="GLintptr"/> <rejection class="^QOpenGL.*$" argument-type="GLsizeiptr"/> + <rejection class="^QOpenGL.*$" argument-type="int64_t*"/> + <rejection class="^QOpenGL.*$" argument-type="int32_t*"/> <rejection class="^QOpenGL.*$" argument-type="GLsync"/> <rejection class="^QOpenGL.*$" argument-type="^GLubyte( const)?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?QMatrix.x. ?\*$"/> diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index 87448849f..08f3daeeb 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -246,6 +246,10 @@ type_map.update({ "qint32": int, "qint64": int, "qint8": int, + "int16_t": int, + "int32_t": int, + "int64_t": int, + "int8_t": int, "qintptr": int, "qsizetype": int, "QList": ArrayLikeVariable, @@ -263,6 +267,10 @@ type_map.update({ "quint32": int, "quint64": int, "quint8": int, + "uint16_t": int, + "uint32_t": int, + "uint64_t": int, + "uint8_t": int, "quintptr": int, "qulonglong": int, "QVariant": Variant, |