diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-21 16:16:09 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-22 16:17:27 +0100 |
| commit | 732be9c2d39ff85b16720821eb29a4ef8e87ab85 (patch) | |
| tree | c7ec188b63e3f7c5227f7d8a16327212ab23d9ec /sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | |
| parent | c892b9299db5d240f2753a877b055f13b6239a63 (diff) | |
Fix conversion of QVariant<->QMatrix<n>x<m>
QMatrix<n>x<m> is a template specialization of
QGenericMatrix<n,m,float> which the type name of the QVariant
contains. To find the proper Shiboken converter for this, change the
name back.
As a drive-by, fix @snippet conversion-sbkobject to return a
PyObjectWrapper() with warning in cases where the QMetaType is valid
but no converter can be found.
Fixes: PYSIDE-2599
Pick-to: 6.6
Change-Id: I4f41dcbaa394fcc1732536c0b7a6569f694f3c45
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 6745f129b..25ceca5c8 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -282,6 +282,9 @@ </primitive-type> <primitive-type name="QVariant" target-lang-api-name="PyObject"> + <extra-includes> + <include file-name="optional" location="global"/> + </extra-includes> <conversion-rule> <native-to-target file="../glue/qtcore.cpp" snippet="return-qvariant"/> <target-to-native> |