diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-05 16:20:05 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-05 16:20:05 +0200 |
commit | c482d66c4403a1e8dd3ae0c6635b6a25ca9d5aaa (patch) | |
tree | 5eb655bd3b6429365ab6c6e84d2d44a774a4b15e /sources/pyside2/libpyside/dynamicqmetaobject.cpp | |
parent | ebab05a07e002655934cde5278084abcc1ccf37a (diff) | |
parent | 396ad18b5f93cdb352e1e628358429134c8b7f17 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I71a1165ef9dea0eb084b271a0362c3f1e12829e3
Diffstat (limited to 'sources/pyside2/libpyside/dynamicqmetaobject.cpp')
-rw-r--r-- | sources/pyside2/libpyside/dynamicqmetaobject.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp index c5de54aa0..857d242a2 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp @@ -467,8 +467,17 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) 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) - m_builder->addSignal(sig); + if (m_baseObject->indexOfSignal(sig) == -1) { + // Registering the parameterNames to the QMetaObject (PYSIDE-634) + // from: + // Signal(..., arguments=['...', ...] + // the arguments are now on data-data->signalArguments + if (!data->data->signalArguments->isEmpty()) { + m_builder->addSignal(sig).setParameterNames(*data->data->signalArguments); + } else { + m_builder->addSignal(sig); + } + } } } } |