diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
| commit | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (patch) | |
| tree | b1292124a86c219fb434db4ec28e8f805ff52287 /src/testlib/qtestcase.cpp | |
| parent | a74e4b85be83e2da47f4a1d8fcf0e78079335b80 (diff) | |
| parent | bab494e4d046f5617d19f5fec35eeff94377c51f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
src/printsupport/kernel/qcups.cpp
src/widgets/styles/qstyle.h
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 3ab3fcc44c..cbf479f1d2 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2878,7 +2878,12 @@ void QTest::qSleep(int ms) // requested time. qint64 requested = 1000000 * (qint64)ms; qint64 diff = timer.nsecsElapsed() - requested; - if (diff * 2 > requested || diff * 10 < -requested) { +#ifndef Q_OS_WIN + const qint64 factor = 2; // more than 50% longer +#else + const qint64 factor = 1; // Windows: 50% is quite common, warn about 100% +#endif + if (diff * factor > requested || diff * 10 < -requested) { QTestLog::warn(qPrintable( QString::fromLatin1("QTest::qSleep() should have taken %1ns, but actually took %2ns!") .arg(requested).arg(diff + requested)), __FILE__, __LINE__); |