From e46f99fdaa7aacfd956f332e12d812da5c2c3479 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 18 Mar 2024 12:15:25 +0100 Subject: [PATCH] QSignalSpy: make the mutex a member variable The static inline was only a workaround for maintaining BC within minor releases while backporting the fix. Since we don't promise BC for QtTest between minor releases, we can make the mutex a proper member variable for Qt 6.8. Amends c837cd75936cbeeb898dd5808edb9dfaf716a76e. Change-Id: I0d6353bdd6a11daa4f927139abf9a867d8c9f95f Reviewed-by: Marc Mutz --- 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 117d4858994..da1debc2dfb 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -215,7 +215,7 @@ private: QTestEventLoop m_loop; bool m_waiting; - static inline QMutex m_mutex; // protects m_waiting, args and the QList base class, between appendArgs() and wait() + QMutex m_mutex; // protects m_waiting, args and the QList base class, between appendArgs() and wait() }; QT_END_NAMESPACE