summaryrefslogtreecommitdiffstats
path: root/src/testlib/qsignalspy.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2024-03-22 07:43:06 +0100
committerMarc Mutz <marc.mutz@qt.io>2024-03-22 15:31:39 +0100
commit2f39027232aa4110637f040ae6569277cbcc3047 (patch)
tree28cea25afa2ed2d9e12809987ff89cef6f1325a2 /src/testlib/qsignalspy.h
parent2862cdb7ba22cc99d1db158888ba0bb32c47e8e8 (diff)
QSignalSpy: move signal verification from init() to verify()
... where it belongs. Amends e68edd6a07adf33db14c2d2f6e4e3785596fa496. Task-number: QTBUG-123544 Change-Id: Ic0e5128555465485b579607a61925cefa5f4716d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/testlib/qsignalspy.h')
-rw-r--r--src/testlib/qsignalspy.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index ffc2129e18..ad152b162e 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -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;