diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-01-17 10:51:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-27 22:40:08 +0000 |
| commit | af3a453d35dfe215478d953bee94997c3e3c65de (patch) | |
| tree | 82f47a387c2ce957195124a9f06cb66e22f569e7 | |
| parent | 491eb18eaecfae83aae117bbe85de0f352ee2c0d (diff) | |
libpyside: Set default signal name only if previously assigned
Just before registering the signal to the meta-object,
the signalName was overwritten instead of checking if it had
some content.
Fixes: PYSIDE-1192
Change-Id: I5fc85bf22ae08bce6969b9381662288a99aee616
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | sources/pyside2/libpyside/dynamicqmetaobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp index 857d242a2..2c5a0ee05 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp @@ -464,7 +464,8 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) if (Signal::checkType(value)) { // Register signals. auto data = reinterpret_cast<PySideSignal *>(value); - data->data->signalName = Shiboken::String::toCString(key); + if (data->data->signalName.isEmpty()) + data->data->signalName = Shiboken::String::toCString(key); for (const auto &s : data->data->signatures) { const auto sig = data->data->signalName + '(' + s.signature + ')'; if (m_baseObject->indexOfSignal(sig) == -1) { |