diff options
author | Marc Mutz <marc.mutz@qt.io> | 2024-03-21 17:28:38 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2024-04-24 21:36:49 +0200 |
commit | 8ab63278ef2cd0d4ffff1391b5a93fee7a9f300a (patch) | |
tree | 5402cfabf36348dc719a12bd5ea5cf69a8ad563a /src | |
parent | ad755020e103b7d3c4f66173c74cf80f6bca3144 (diff) |
QSignalSpy: de-inline chrono wait()
Because we can now that there's a .cpp file.
Task-number: QTBUG-123544
Change-Id: Ie525e157016cb3c0c7a273fba3fadb13d54c1877
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/testlib/qsignalspy.cpp | 16 | ||||
-rw-r--r-- | src/testlib/qsignalspy.h | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/testlib/qsignalspy.cpp b/src/testlib/qsignalspy.cpp index a60946b7c1..a4c0291481 100644 --- a/src/testlib/qsignalspy.cpp +++ b/src/testlib/qsignalspy.cpp @@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE otherwise returns \c false. */ -/*! \fn bool QSignalSpy::wait(std::chrono::milliseconds timeout) +/*! \since 6.6 Starts an event loop that runs until the given signal is received @@ -146,6 +146,20 @@ QT_BEGIN_NAMESPACE spy.wait(2s); \endcode */ +bool QSignalSpy::wait(std::chrono::milliseconds timeout) +{ + QMutexLocker locker(&m_mutex); + Q_ASSERT(!m_waiting); + const qsizetype origCount = size(); + m_waiting = true; + locker.unlock(); + + m_loop.enterLoop(timeout); + + locker.relock(); + m_waiting = false; + return size() > origCount; +} bool QSignalSpy::isSignalMetaMethodValid(const QMetaMethod &signal) { diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 073e5aa8c0..b15831768b 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -44,20 +44,7 @@ public: bool wait(int timeout) { return wait(std::chrono::milliseconds{timeout}); } - bool wait(std::chrono::milliseconds timeout = std::chrono::seconds{5}) - { - QMutexLocker locker(&m_mutex); - Q_ASSERT(!m_waiting); - const qsizetype origCount = size(); - m_waiting = true; - locker.unlock(); - - m_loop.enterLoop(timeout); - - locker.relock(); - m_waiting = false; - return size() > origCount; - } + Q_TESTLIB_EXPORT bool wait(std::chrono::milliseconds timeout = std::chrono::seconds{5}); int qt_metacall(QMetaObject::Call call, int methodId, void **a) override { |