QSignalSpy: move signal verification from init() to verify()
... where it belongs.
Amends e68edd6a07.
Task-number: QTBUG-123544
Change-Id: Ic0e5128555465485b579607a61925cefa5f4716d
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
bb10
parent
2862cdb7ba
commit
2f39027232
|
|
@ -88,7 +88,7 @@ public:
|
|||
private:
|
||||
ObjectSignal verify(const QObject *obj, QMetaMethod signal)
|
||||
{
|
||||
if (isObjectValid(obj))
|
||||
if (isObjectValid(obj) && isSignalMetaMethodValid(signal))
|
||||
return {obj, signal};
|
||||
else
|
||||
return {};
|
||||
|
|
@ -141,9 +141,6 @@ private:
|
|||
|
||||
void init(const QObject *obj, QMetaMethod signal)
|
||||
{
|
||||
if (!isSignalMetaMethodValid(signal))
|
||||
return;
|
||||
|
||||
initArgs(signal, obj);
|
||||
if (!connectToSignal(obj, signal.methodIndex()))
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in New Issue