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-27 16:45:27 +0100 |
| commit | 20984759f6c612cbf763d6208d5bea9f68d5f381 (patch) | |
| tree | 4866cd371f947068da0f925d0db91b9751404bdc | |
| parent | 461b52bf73a0f1aa92345c10739dd915f945de4c (diff) | |
pysideproperty.cpp: Fix compilation with MSVC2019/C++ 17 mode
It does not accept a ternary operator with QByteArray/const char *
arguments.
Change-Id: I02bcb740100c4568ecb262fa6ecf3d466e02c875
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 86b0e5164da3ec9dc82c2bf6f0f7f012294f6e9d)
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/libpyside/pysideproperty.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp index 97729d28c..33b7c9c2e 100644 --- a/sources/pyside2/libpyside/pysideproperty.cpp +++ b/sources/pyside2/libpyside/pysideproperty.cpp @@ -279,13 +279,13 @@ _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); |