aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-29 14:30:32 +0300
committerQt by Nokia <qt-info@nokia.com>2012-06-05 07:46:25 +0200
commit332fe582d1bd590b59618cc7b732be9bf7f9f475 (patch)
treead18487ca8565080b5f67a30ef29e5c93e00d065 /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
parent3a985b08e94d4d1bb61faba260df3fe13c94391c (diff)
Do not lose timestamps in mouse press events
Change-Id: Iaa7953cd2ea21f43a98f984b6aea43feb0c2fbed Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
-rw-r--r--tests/auto/quick/qquickflickable/tst_qquickflickable.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index f76794017d..39d1075e53 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -384,6 +384,10 @@ void tst_qquickflickable::wheel()
void tst_qquickflickable::movingAndDragging()
{
+#ifdef Q_OS_MAC
+ QSKIP("Producing flicks on Mac CI impossible due to timing problems");
+#endif
+
QQuickView *canvas = new QQuickView;
canvas->setSource(testFileUrl("flickable03.qml"));
canvas->show();
@@ -449,9 +453,9 @@ void tst_qquickflickable::movingAndDragging()
// underlying drivers will hopefully provide a pre-calculated velocity
// (based on more data than what the UI gets), thus making this use case
// working even with small movements.
- QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 10));
- QTest::mouseMove(canvas, QPoint(50, 300), 10);
- QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(50, 100), 10);
+ QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(50, 300));
+ QTest::mouseMove(canvas, QPoint(50, 10), 10);
+ QTest::mouseRelease(canvas, Qt::LeftButton, 0, QPoint(50, 10), 10);
QCOMPARE(vFlickSpy.count(), 1);
@@ -504,10 +508,6 @@ void tst_qquickflickable::movingAndDragging()
QCOMPARE(dragEndSpy.count(), 1);
// Don't test moving because a flick could occur
-#ifdef Q_OS_MAC
- QSKIP("Producing flicks on Mac CI impossible due to timing problems");
-#endif
-
QTRY_VERIFY(!flickable->isMoving());
// Stop on a full pixel after user interaction
QCOMPARE(flickable->contentX(), (qreal)qRound(flickable->contentX()));