diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-10-20 14:18:25 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-10-20 14:18:25 (GMT) |
commit | 9bdc0a2d18bcc4938d79079e184a05acd5f43b22 (patch) | |
tree | b4cff4d92d9239cc30c2c9bbf040b2493af66b26 /tests/auto/qtabwidget/tst_qtabwidget.cpp | |
parent | 147c524e703d4727d03c5f2ea3f98ace25905b73 (diff) | |
parent | 76ef766a32cdcfd9cd64cf1d288c92a2b2040c15 (diff) | |
download | Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.zip Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.gz Qt-9bdc0a2d18bcc4938d79079e184a05acd5f43b22.tar.bz2 |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'tests/auto/qtabwidget/tst_qtabwidget.cpp')
-rw-r--r-- | tests/auto/qtabwidget/tst_qtabwidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index 27c19df..1387a92 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -590,9 +590,11 @@ void tst_QTabWidget::paintEventCount() QTest::qWait(1000); - // Mac and Windows get multiple repaints on the first show, so use those as a starting point. + // Mac, Windows and Windows CE get multiple repaints on the first show, so use those as a starting point. static const int MaxInitialPaintCount = -#if defined(Q_WS_WIN) +#if defined(Q_OS_WINCE) + 4; +#elif defined(Q_WS_WIN) 2; #elif defined(Q_WS_MAC) 5; |