summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscroller
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@nokia.com>2010-12-03 14:48:53 +0100
committerRobert Griebl <robert.griebl@nokia.com>2010-12-03 14:50:13 +0100
commitd1f9a534da288884f443a975f428b0cfe0a7b29b (patch)
tree47961e25270018bb37e0bd99881c2da34435a297 /tests/auto/qscroller
parenta75693ec46148be981aa0009c2eda3dcd3826731 (diff)
Touch events do not work on Mac OS 10.5
Diffstat (limited to 'tests/auto/qscroller')
-rw-r--r--tests/auto/qscroller/tst_qscroller.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/qscroller/tst_qscroller.cpp
index 61d398019c..4179feed9c 100644
--- a/tests/auto/qscroller/tst_qscroller.cpp
+++ b/tests/auto/qscroller/tst_qscroller.cpp
@@ -382,10 +382,13 @@ void tst_QScroller::scrollTo()
void tst_QScroller::scroll()
{
-#ifndef QT_NO_GESTURES
+#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");
+ return;
+#endif
+#ifndef QT_NO_GESTURES
// -- good case. normal scroll
-
tst_QScrollerWidget *sw = new tst_QScrollerWidget();
sw->scrollArea = QRectF(0, 0, 1000, 1000);
QScroller::grabGesture(sw, QScroller::TouchGesture);
@@ -426,6 +429,11 @@ void tst_QScroller::scroll()
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");
+ return;
+#endif
+
#ifndef QT_NO_GESTURES
tst_QScrollerWidget *sw = new tst_QScrollerWidget();
sw->scrollArea = QRectF(0, 0, 1000, 1000);