diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /src/testlib | |
parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 2a6cad698f..8b0820b941 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2327,7 +2327,7 @@ void QTest::qSleep(int ms) #elif defined(Q_OS_WIN) Sleep(uint(ms)); #else - struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; + struct timespec ts = { time_t(ms / 1000), (ms % 1000) * 1000 * 1000 }; nanosleep(&ts, NULL); #endif } |