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/glue/qtcore.cpp | |
| 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/glue/qtcore.cpp')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 83c8f8656..9b927cce4 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -1678,6 +1678,14 @@ Py_END_ALLOW_THREADS %out = %OUTTYPE(PyLong_AsUnsignedLong(%in)); // @snippet conversion-pylong-unsigned +// @snippet conversion-pylong-quintptr +#if defined(IS_PY3K) && QT_POINTER_SIZE == 8 +%out = %OUTTYPE(PyLong_AsUnsignedLongLong(%in)); +#else +%out = %OUTTYPE(PyLong_AsUnsignedLong(%in)); +#endif +// @snippet conversion-pylong-quintptr + // @snippet conversion-pyunicode #ifndef Py_LIMITED_API Py_UNICODE *unicode = PyUnicode_AS_UNICODE(%in); @@ -1878,6 +1886,14 @@ return PyLong_FromLong(%in); return PyLong_FromUnsignedLong(%in); // @snippet return-pylong-unsigned +// @snippet return-pylong-quintptr +#if defined(IS_PY3K) && QT_POINTER_SIZE == 8 +return PyLong_FromUnsignedLongLong(%in); +#else +return PyLong_FromUnsignedLong(%in); +#endif +// @snippet return-pylong-quintptr + // @snippet return-pyunicode QByteArray ba = %in.toUtf8(); return PyUnicode_FromStringAndSize(ba.constData(), ba.size()); |