From 24c2b8f8ab68c21953e28051bf402171ccb204be Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 15 Mar 2024 17:12:19 +0100 Subject: [PATCH] QSignalSpy: fix C'n'P mistake in a qWarning() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The warning for the new-style signal constructor was copied from the old-style signal constructor, but not adjusted to its new home. The signal pointer passed here is not the signal "name", but a signal "pointer" (-to-member-function, but no need to go into that much detail). Amends 6fc7d76e7309c01a364b0f72d253735366674f29, but not picking to very strict LTS branches, just in case someone has a QTest::ignoreMsg() installed on it. Pick-to: 6.6 6.5 Change-Id: Ia1f6b7001f38202ac72f9945c4a822d81562cdbf Reviewed-by: David Faure Reviewed-by: Mårten Nordheim (cherry picked from commit 7565034aadf955537be908a94e4cef16096a041f) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qsignalspy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 0c4ae347b8b..117d4858994 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -63,7 +63,7 @@ public: return; if (!signal0) { - qWarning("QSignalSpy: Null signal name is not valid"); + qWarning("QSignalSpy: Null signal pointer is not valid"); return; }