1 files changed, 8 insertions, 16 deletions
diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/qscroller/tst_qscroller.cpp
index 7e7405b113..9ed4965d45 100644
--- a/tests/auto/qscroller/tst_qscroller.cpp
+++ b/tests/auto/qscroller/tst_qscroller.cpp
@@ -134,8 +134,10 @@ private slots:
     void staticScrollers();
     void scrollerProperties();
     void scrollTo();
+#if !defined(QT_NO_GESTURES) && !(defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6))
     void scroll();
     void overshoot();
+#endif
 };
 
 /*! \internal
@@ -381,14 +383,10 @@ void tst_QScroller::scrollTo()
     }
 }
 
+// Mac OS X < 10.6 does not support QTouchEvents.
+#if !defined(QT_NO_GESTURES) && !(defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6))
 void tst_QScroller::scroll()
 {
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents", SkipAll);
-    return;
-#endif
-
-#ifndef QT_NO_GESTURES
     // -- good case. normal scroll
     tst_QScrollerWidget *sw = new tst_QScrollerWidget();
     sw->scrollArea = QRectF(0, 0, 1000, 1000);
@@ -425,17 +423,13 @@ void tst_QScroller::scroll()
     QCOMPARE(sw->currentPos.y(), 500.0);
 
     delete sw;
-#endif
 }
+#endif
 
+// Mac OS X < 10.6 does not support QTouchEvents.
+#if !defined(QT_NO_GESTURES) && !(defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6))
 void tst_QScroller::overshoot()
 {
-#if defined(Q_OS_MACX) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-    QSKIP("Mac OS X < 10.6 does not support QTouchEvents", SkipAll);
-    return;
-#endif
-
-#ifndef QT_NO_GESTURES
     tst_QScrollerWidget *sw = new tst_QScrollerWidget();
     sw->scrollArea = QRectF(0, 0, 1000, 1000);
     QScroller::grabGesture(sw, QScroller::TouchGesture);
@@ -527,11 +521,9 @@ void tst_QScroller::overshoot()
     QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
     QCOMPARE( sw->receivedOvershoot, false );
 
-
     delete sw;
-#endif
 }
-
+#endif
 
 QTEST_MAIN(tst_QScroller)