diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-11 10:39:47 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-11 10:41:36 (GMT) |
| commit | 143f16aedf9cf47e8848637152899447c3ca148c (patch) | |
| tree | abc86cfe7792233d244a0af94df4f8dd7be86f13 | |
| parent | 471d020c212266cd84481cf60a61fc223f8ab316 (diff) | |
| download | Qt-143f16aedf9cf47e8848637152899447c3ca148c.zip Qt-143f16aedf9cf47e8848637152899447c3ca148c.tar.gz Qt-143f16aedf9cf47e8848637152899447c3ca148c.tar.bz2 | |
Autotest: make the qabstractslider test pass on mac
Since we changed the behaviour for scrolling on mac to not
be restriced to an upper limit (pagestep), we need to adjust
the auto test accordingly
Rev-by: prasanth
| -rw-r--r-- | tests/auto/qabstractslider/tst_qabstractslider.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index 293af36..cf069db 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -728,7 +728,12 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Vertical) // orientation of slider << int(Qt::Vertical) // orientation of wheel +#ifndef Q_WS_MAC << 1 // expected position after +#else + // We don't restrict scrolling to pageStep on Mac + << 100 // expected position after +#endif << QPoint(1,1); QTest::newRow("Different orientation") << 0 // initial position @@ -742,7 +747,12 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Vertical) // orientation of wheel +#ifndef Q_WS_MAC << 1 // expected position after +#else + // We don't restrict scrolling to pageStep on Mac + << 100 // expected position after +#endif << QPoint(1,1); QTest::newRow("Different orientation2")<< 0 // initial position @@ -756,7 +766,12 @@ void tst_QAbstractSlider::wheelEvent_data() << 1 // delta << int(Qt::Horizontal) // orientation of slider << int(Qt::Vertical) // orientation of wheel +#ifndef Q_WS_MAC << 1 // expected position after +#else + // We don't restrict scrolling to pageStep on Mac + << 100 // expected position after +#endif << QPoint(0,0); |