diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-03 11:18:09 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-06 00:17:14 +0200 |
commit | a0e0b51001edfc1c7aea113c472ce995efa833fd (patch) | |
tree | 9a7f2b424806338301c0c262b5d268b94ec1ef61 /src/testlib | |
parent | 75d1d2a91376c3338510cf1e5fa10feaf8df5785 (diff) |
Inline QTest::qSleep()
Simply use QThread::msleep() to implement it.
Change-Id: I37c255fc70951715edc489d9f67669b01af380b1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestcase.cpp | 6 | ||||
-rw-r--r-- | src/testlib/qtestcase.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 6b9da24025..c2b33019b2 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2491,12 +2491,6 @@ bool QTest::currentTestFailed() \sa {QTest::qWait()} */ -void QTest::qSleep(int ms) -{ - // ### Qt 6, move to QtCore or remove altogether - QTEST_ASSERT(ms > 0); - QTestPrivate::qSleep(ms); -} /*! \internal */ diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index e5f2a8bbbf..6fe962277a 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -48,6 +48,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qtemporarydir.h> +#include <QtCore/qthread.h> #include <string.h> @@ -335,7 +336,7 @@ namespace QTest char *val1, char *val2, const char *actual, const char *expected, const char *file, int line); - Q_TESTLIB_EXPORT void qSleep(int ms); + inline void qSleep(int ms) { QThread::msleep(ms); } Q_TESTLIB_EXPORT void addColumnInternal(int id, const char *name); template <typename T> |