1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Qt::PreciseTimer for the QDeadlineTimers in QTest::qWait*

Browse Source 
QDeadlineTimer will eventually support CLOCK_MONOTONIC_COARSE on Linux,
so let's be safe before that change appears.

Change-Id: I9b423f1b71194205b27afffd14a383a7e9f66a9d
Reviewed-by: Stéphane Fabry, Cutesoft <stephane.fabry@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Thiago Macieira 2017-02-15 08:44:19 -08:00
parent fb376e0fcc
commit a7ba91bd64
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestsystem.h
View File

@ -58,7 +58,7 @@ namespace QTest
{ {
Q_ASSERT(QCoreApplication::instance()); Q_ASSERT(QCoreApplication::instance());
QDeadlineTimer timer(ms); QDeadlineTimer timer(ms, Qt::PreciseTimer);
int remaining = ms; int remaining = ms;
do { do {
QCoreApplication::processEvents(QEventLoop::AllEvents, remaining); QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
@ -74,7 +74,7 @@ namespace QTest
#ifdef QT_GUI_LIB #ifdef QT_GUI_LIB
inline static bool qWaitForWindowActive(QWindow *window, int timeout = 5000) inline static bool qWaitForWindowActive(QWindow *window, int timeout = 5000)
{ {
QDeadlineTimer timer(timeout); QDeadlineTimer timer(timeout, Qt::PreciseTimer);
int remaining = timeout; int remaining = timeout;
while (!window->isActive() && remaining > 0) { while (!window->isActive() && remaining > 0) {
QCoreApplication::processEvents(QEventLoop::AllEvents, remaining); QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
@ -101,7 +101,7 @@ namespace QTest
inline static bool qWaitForWindowExposed(QWindow *window, int timeout = 5000) inline static bool qWaitForWindowExposed(QWindow *window, int timeout = 5000)
{ {
QDeadlineTimer timer(timeout); QDeadlineTimer timer(timeout, Qt::PreciseTimer);
int remaining = timeout; int remaining = timeout;
while (!window->isExposed() && remaining > 0) { while (!window->isExposed() && remaining > 0) {
QCoreApplication::processEvents(QEventLoop::AllEvents, remaining); QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);