aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickflickable
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-08 10:37:39 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-09 20:14:07 +0000
commit6673b396bfe16e2d23ef1f23818cf6a991a2c57b (patch)
tree63c7d483ea7a1982d122c6042870a93e9332e44b /tests/auto/quick/qquickflickable
parent9b13b560ee5fb6d0fb5d5cd91ca6f782a8741327 (diff)
test: tst_qquickflickable::flickOnRelease() got fixed
Task-number: QTBUG-26094 Task-number: QTBUG-65343 Change-Id: Iee5347227cc943ae6d5d9ba480c0fb8024d258aa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickflickable')
-rw-r--r--tests/auto/quick/qquickflickable/tst_qquickflickable.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index 04cfac70ad..f19b18e7c8 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -1346,12 +1346,6 @@ void tst_qquickflickable::flickOnRelease()
// wait for any motion to end
QTRY_VERIFY(!flickable->isMoving());
-#ifdef Q_OS_MAC
-# if QT_CONFIG(opengl)
- // QEXPECT_FAIL("", "QTBUG-26094 stopping on a full pixel doesn't work on OS X", Continue);
- QSKIP("This should be fixed after qt5 dev integrated again, see QTBUG-65343");
-# endif
-#endif
// Stop on a full pixel after user interaction
QCOMPARE(flickable->contentY(), (qreal)qRound(flickable->contentY()));
}