diff options
| author | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
| commit | 331522fdcbf14d757b61ed79dcc11649f62f28c8 (patch) | |
| tree | 57653fdd33e55e5093cc88ec8ff67e3fdfafc913 /tests/auto/qtimer/tst_qtimer.cpp | |
| parent | dd1a7c2186348157c4a255f56f280006c8d8c17d (diff) | |
| parent | 5ca6264933af60b3cd376b7f08bea008fa69b515 (diff) | |
| download | Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.zip Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.gz Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.bz2 | |
Merge branch 'variousFixes' into 4.7-s60
Diffstat (limited to 'tests/auto/qtimer/tst_qtimer.cpp')
| -rw-r--r-- | tests/auto/qtimer/tst_qtimer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index 8d213ed..b651187 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -161,8 +161,9 @@ void tst_QTimer::singleShotTimeout() QCOMPARE(helper.count, 1); } -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) -// Increase wait as emulator startup can cause unexpected delays +#if defined(Q_OS_SYMBIAN) +// Increase wait as emulator startup can cause unexpected delays, and +// on hardware there are sometimes spikes right after process startup. #define TIMEOUT_TIMEOUT 2000 #else #define TIMEOUT_TIMEOUT 200 |