diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-26 07:40:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-26 07:41:36 +0200 |
| commit | 49c4d1f31014605c9355b1f6901e28e5762301d1 (patch) | |
| tree | 8293343bf138ef2d53ab118b667fe1205d2b0bd7 /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | 10390cc16084c5f386163664f6e42d9e4d28b129 (diff) | |
| parent | 6717d3540fac74c91d9381958a08e60f6532d402 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9c7163094bc934f481002adcea78ef4928ed26be
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 272f9a766..c27029f03 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -223,9 +223,9 @@ </primitive-type> <primitive-type name="quintptr" target-lang-api-name="PyLong"> <conversion-rule> - <native-to-target file="../glue/qtcore.cpp" snippet="return-pylong-unsigned"/> + <native-to-target file="../glue/qtcore.cpp" snippet="return-pylong-quintptr"/> <target-to-native> - <add-conversion type="PyLong" file="../glue/qtcore.cpp" snippet="conversion-pylong-unsigned"/> + <add-conversion type="PyLong" file="../glue/qtcore.cpp" snippet="conversion-pylong-quintptr"/> </target-to-native> </conversion-rule> </primitive-type> |