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>bb10
parent
ad755020e1
commit
8ab63278ef
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue