From 2f39027232aa4110637f040ae6569277cbcc3047 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 22 Mar 2024 07:43:06 +0100
Subject: 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>
---
 src/testlib/qsignalspy.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/testlib/qsignalspy.h')

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;
-- 
cgit v1.2.3