diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-10-12 14:48:33 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-10-12 14:48:33 (GMT) |
| commit | bc53cf1334738307110a661f19b6fbb9be9b72d6 (patch) | |
| tree | 268f8a23eba6e491258d0189362e44deb3fdce6d /tests/auto/qtableview | |
| parent | 8da7252de0badb818302763cbe62c38ad699f1f3 (diff) | |
| parent | 8df79a473e1a7e5c79b9b10827985bf3e9501002 (diff) | |
| download | Qt-bc53cf1334738307110a661f19b6fbb9be9b72d6.zip Qt-bc53cf1334738307110a661f19b6fbb9be9b72d6.tar.gz Qt-bc53cf1334738307110a661f19b6fbb9be9b72d6.tar.bz2 | |
Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6
Diffstat (limited to 'tests/auto/qtableview')
| -rw-r--r-- | tests/auto/qtableview/tst_qtableview.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 4ea1b19..eab5a35 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -3569,17 +3569,14 @@ void tst_QTableView::mouseWheel_data() void tst_QTableView::mouseWheel() { +#ifdef Q_OS_WINCE + QSKIP("Since different Windows CE versions sport different taskbars, we skip this test", SkipAll); +#endif QFETCH(int, scrollMode); QFETCH(int, delta); QFETCH(int, horizontalPositon); QFETCH(int, verticalPosition); - if (scrollMode == int(QAbstractItemView::ScrollPerPixel)) - { -#ifdef Q_OS_WINCE - QSKIP("Since different Windows CE versions sport different taskbars, we skip this test", SkipSingle); -#endif - } QtTestTableModel model(100, 100); QtTestTableView view; view.resize(500, 500); |