diff options
| -rw-r--r-- | tests/auto/qscrollbar/qscrollbar.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qscrollbar/tst_qscrollbar.cpp | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/qscrollbar/qscrollbar.pro index 3ead270..3f8e6cf 100644 --- a/tests/auto/qscrollbar/qscrollbar.pro +++ b/tests/auto/qscrollbar/qscrollbar.pro @@ -1,4 +1,2 @@ load(qttest_p4) SOURCES += tst_qscrollbar.cpp - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qscrollbar/tst_qscrollbar.cpp b/tests/auto/qscrollbar/tst_qscrollbar.cpp index fa93a22..3e941cc 100644 --- a/tests/auto/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/qscrollbar/tst_qscrollbar.cpp @@ -44,6 +44,7 @@ #include <QScrollBar> #include <QStyleOptionSlider> #include <QScrollArea> +#include <QSysInfo> class tst_QScrollBar : public QObject { @@ -99,6 +100,11 @@ void tst_QScrollBar::scrollSingleStep() QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y())); QTest::qWait(510); // initial delay is 500 for setRepeatAction disconnect(testWidget, SIGNAL(actionTriggered(int)), 0, 0); +#ifdef Q_WS_MAC + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "Fails on Mac OS X Lion. See: QTBUG-25272", Abort); + } +#endif QCOMPARE(testWidget->value(), testWidget->singleStep()); } @@ -137,7 +143,9 @@ void tst_QScrollBar::task_209492() // Check that the action was triggered once. #ifdef Q_WS_MAC - QEXPECT_FAIL("", "Fix does does not work on Mac due to paint architechure differences.", Abort); + if (QSysInfo::MacintoshVersion == QSysInfo::MV_LION) { + QEXPECT_FAIL("", "Fix does not work on Mac OS X Lion due to paint architechure differences. See: QTBUG-25272", Abort); + } #endif QCOMPARE(scrollArea.scrollCount, 1); QCOMPARE(spy.count(), 1); |