diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:15:57 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:15:57 +0300 |
| commit | 8d8e799cb7ab0bebe8f6dd4172848159eb3c8087 (patch) | |
| tree | 143f0ade6f75a55fcf6824e2b5a5b8a3e48ba1fa /sources/pyside2/libpyside/pysideproperty.cpp | |
| parent | 2342e61cb53824e2dcd6324e3d108500d61ffee2 (diff) | |
| parent | 927c0d3e625455a8e5fedef3ed6662c8acba1858 (diff) | |
Merge tag 'v5.15.9-lts' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Qt For Python Release 5.15.9
Change-Id: I6a2717036c50f27aa0eeea6cfcfbc2970c0bd04a
Diffstat (limited to 'sources/pyside2/libpyside/pysideproperty.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysideproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp index 33b7c9c2e..73d6767dd 100644 --- a/sources/pyside2/libpyside/pysideproperty.cpp +++ b/sources/pyside2/libpyside/pysideproperty.cpp @@ -373,7 +373,7 @@ static PyObject *qPropertyDocGet(PyObject *self, void *) if (pData->fget != nullptr) { // PYSIDE-1019: Fetch the default `__doc__` from fget. We do it late. AutoDecRef get_doc(PyObject_GetAttr(pData->fget, PyMagicName::doc())); - if (!get_doc.isNull()) { + if (!get_doc.isNull() && get_doc.object() != Py_None) { pData->doc = String::toCString(get_doc); pData->getter_doc = true; if (Py_TYPE(self) == PySidePropertyTypeF()) |