summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2009-11-18 16:06:18 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2009-11-18 16:24:46 (GMT)
commit93a88077ebbf2b5b52608a840f0e71377b0d8c67 (patch)
tree11d95a059f207ae94e0b4f25286ae7a30a220f31
parente790855c3c80b43511eed0b0bcab9121ac67718c (diff)
downloadQt-93a88077ebbf2b5b52608a840f0e71377b0d8c67.zip
Qt-93a88077ebbf2b5b52608a840f0e71377b0d8c67.tar.gz
Qt-93a88077ebbf2b5b52608a840f0e71377b0d8c67.tar.bz2
Fixed tst_QTableView::mouseWheel auto-test on Mac
The fix reverts some changes from 1f4e378ca0f9c63bb99a92f3e98b104a0baa408a. Reviewed-by: Olivier
-rw-r--r--tests/auto/qtableview/tst_qtableview.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 33c7067..b61d2ad 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -3614,17 +3614,9 @@ void tst_QTableView::mouseWheel_data()
QTest::newRow("scroll down per item")
<< int(QAbstractItemView::ScrollPerItem) << -120
<< 10 + qApp->wheelScrollLines() << 10 + qApp->wheelScrollLines();
-#ifdef Q_WS_MAC
- // On Mac, we always scroll one pixel per 120 delta (rather than multiplying with
- // singleStep) since wheel events are accelerated by the OS.
- QTest::newRow("scroll down per pixel")
- << int(QAbstractItemView::ScrollPerPixel) << -120
- << 10 + qApp->wheelScrollLines() << 10 + qApp->wheelScrollLines();
-#else
QTest::newRow("scroll down per pixel")
<< int(QAbstractItemView::ScrollPerPixel) << -120
<< 10 + qApp->wheelScrollLines() * 89 << 10 + qApp->wheelScrollLines() * 28;
-#endif
}
void tst_QTableView::mouseWheel()