From 86b0e5164da3ec9dc82c2bf6f0f7f012294f6e9d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 26 Nov 2020 08:37:35 +0100 Subject: 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 --- sources/pyside6/libpyside/pysideproperty.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sources/pyside6') 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); -- cgit v1.2.3