diff options
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 14 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index f151acd703..c51507c2e2 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -4038,7 +4038,19 @@ QMetaObject::Connection QObject::connectImpl(const QObject *sender, void **signa } QObjectPrivate::get(s)->addConnection(signal_index, c.data()); - return QMetaObject::Connection(c.take()); + QMetaObject::Connection ret(c.take()); + locker.unlock(); + + // reconstruct the signature to call connectNotify + const char *sig = senderMetaObject->d.stringdata + senderMetaObject->d.data[ + reinterpret_cast<const QMetaObjectPrivate*>(senderMetaObject->d.data)->methodData + + 5 * (signal_index - signalOffset)]; + QVarLengthArray<char> signalSignature(qstrlen(sig) + 2); + signalSignature.data()[0] = char(QSIGNAL_CODE + '0'); + strcpy(signalSignature.data() + 1 , sig); + s->connectNotify(signalSignature.data()); + + return ret; } /*! diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index c1471e4f21..9bd54bd035 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -75,6 +75,7 @@ private slots: void findChildren(); void connectDisconnectNotify_data(); void connectDisconnectNotify(); + void connectNotifyPtr(); void emitInDefinedOrder(); void customTypes(); void streamCustomTypes(); @@ -849,6 +850,19 @@ void tst_QObject::connectDisconnectNotify() delete r; } +void tst_QObject::connectNotifyPtr() +{ + NotifyObject *s = new NotifyObject; + NotifyObject *r = new NotifyObject; + + connect( (SenderObject*)s, &SenderObject::signal1, (ReceiverObject*)r, &ReceiverObject::slot1 ); + QCOMPARE( s->org_signal, s->nw_signal ); + QCOMPARE( s->org_signal.toLatin1(), QMetaObject::normalizedSignature(SIGNAL(signal1()))); + + delete s; + delete r; +} + class SequenceObject : public ReceiverObject { Q_OBJECT |