diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-11-18 16:14:14 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 08:58:18 +0100 |
| commit | 30266d8015cff316745b5f405079f71b713c6802 (patch) | |
| tree | 704393caf3d194df84be3deb0942e0920c836124 | |
| parent | b28a690c8f863a3e2afc22ed87f0dc8d77d339dc (diff) | |
Remove obsolete code from QTimer test.
The removed code was for Windows versions <= 2000, which are not
supported by Qt5.
Change-Id: I779ffb8427035b7eb97d8d0af403d03065bc779c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index db796832bf..73330b1da2 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -228,11 +228,8 @@ void tst_QTimer::livelock() QTRY_COMPARE(tester.timeoutsForFirst, 1); QCOMPARE(tester.timeoutsForExtra, 0); QTRY_COMPARE(tester.timeoutsForSecond, 1); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - if (QSysInfo::WindowsVersion < QSysInfo::WV_XP) - QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue); -#elif defined(Q_OS_WINCE) - QEXPECT_FAIL("non-zero timer", "Windows CE devices often too slow", Continue); +#if defined(Q_OS_WINCE) + QEXPECT_FAIL("non-zero timer", "Windows CE devices often too slow", Continue); #endif QVERIFY(tester.postEventAtRightTime); } |