diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-26 08:37:35 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-26 15:56:53 +0000 |
| commit | 86b0e5164da3ec9dc82c2bf6f0f7f012294f6e9d (patch) | |
| tree | 9e641f32ce6cf79fcb272cb8d4ebc5bde6e1a571 | |
| parent | 00a1cc83eccc357c96c347abba28d53ce6395789 (diff) | |
pysideproperty.cpp: Fix compilation with MSVC2019/C++ 17 mode
It does not accept a ternary operator with QByteArray/const char *
arguments.
Pick-to: 5.15
Change-Id: I02bcb740100c4568ecb262fa6ecf3d466e02c875
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/libpyside/pysideproperty.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp index b031c5b12..a8757108b 100644 --- a/sources/pyside6/libpyside/pysideproperty.cpp +++ b/sources/pyside6/libpyside/pysideproperty.cpp @@ -270,13 +270,12 @@ _property_copy(PyObject *old, PyObject *get, PyObject *set, PyObject *reset, PyO Py_XDECREF(del); del = pData->fdel ? pData->fdel : Py_None; } - if (pData->getter_doc && get != Py_None) { - /* make _init use __doc__ from getter */ - doc = ""; - } - else { - doc = !pData->doc.isEmpty() ? pData->doc : ""; - } + // make _init use __doc__ from getter + if ((pData->getter_doc && get != Py_None) || pData->doc.isEmpty()) + doc.clear(); + else + doc = pData->doc; + auto notify = pData->notify ? pData->notify : Py_None; PyObject *typeName = String::fromCString(pData->typeName); |