diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-04-13 10:18:03 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-13 11:32:04 +0000 |
| commit | 4267fd4fa1e98557056c643d39fc276dc48091dd (patch) | |
| tree | 69685e7f668c4a1754313d12cd2e003854e91da0 | |
| parent | 8bf1ca923d707b48b6d5a1dffa7ad62893ae6204 (diff) | |
Add std::pair as a container in Core
Since Qt6's QPair uses it underneath,
we require to have a declaration so we are able to transform
from and to Python.
Fixes: PYSIDE-1544
Change-Id: I9cc753cbbe0b352382996e896c00faff9bc0f819
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit e9bf3bda62590a42377d21ae0e5646f5401f982a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index d0bb7ee32..ab7d7e200 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -499,6 +499,16 @@ </conversion-rule> </container-type> + <!-- QPair is implemented with std::pair since Qt 6 --> + <container-type name="std::pair" type="pair"> + <conversion-rule> + <native-to-target file="../glue/qtcore.cpp" snippet="return-qpair"/> + <target-to-native> + <add-conversion type="PySequence" file="../glue/qtcore.cpp" snippet="conversion-qpair-pysequence"/> + </target-to-native> + </conversion-rule> + </container-type> + <rejection class="*" function-name="d_func"/> <rejection class="*" function-name="data_ptr"/> <rejection class="*" function-name="detach"/> |