diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-22 04:57:29 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-22 04:57:29 (GMT) |
| commit | e7955a49b59a8c2568d1dcabaf6e72aca8a26bb0 (patch) | |
| tree | 30510f83c40606273020198597c5f25d85205059 /tests/auto/qtabwidget | |
| parent | 3be273fc751624fab078878904ad3cb483cd141f (diff) | |
| parent | 61836f454fd49286bce038c386eb8921b88450da (diff) | |
| download | Qt-e7955a49b59a8c2568d1dcabaf6e72aca8a26bb0.zip Qt-e7955a49b59a8c2568d1dcabaf6e72aca8a26bb0.tar.gz Qt-e7955a49b59a8c2568d1dcabaf6e72aca8a26bb0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/painting/qtextureglyphcache.cpp
Diffstat (limited to 'tests/auto/qtabwidget')
| -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; |