diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
| commit | 91b93e1021ccc06d13e0d66a43bf7f9063faeff3 (patch) | |
| tree | f5270164466b42367d4df63d723b3a4db4d7d0fe /sources/pyside2/libpyside/dynamicqmetaobject.cpp | |
| parent | edae6185cef9c0ddd7c7c88bfa97c5043ba0d78a (diff) | |
| parent | 06f97eca45ddadf4f04229cf14d5dc0bbd867316 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia87a2e46bb051f1cccf3b7ba988aeb5eb32c0f0e
Diffstat (limited to 'sources/pyside2/libpyside/dynamicqmetaobject.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/dynamicqmetaobject.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp index 417ffef5f..c5de54aa0 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp @@ -464,16 +464,9 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) if (Signal::checkType(value)) { // Register signals. auto data = reinterpret_cast<PySideSignal *>(value); - const char *signalName = Shiboken::String::toCString(key); - data->signalName = strdup(signalName); - QByteArray sig; - sig.reserve(128); - for (int i = 0; i < data->signaturesSize; ++i) { - sig = signalName; - sig += '('; - if (data->signatures[i]) - sig += data->signatures[i]; - sig += ')'; + 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); } |