From 6673b396bfe16e2d23ef1f23818cf6a991a2c57b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 8 Jan 2018 10:37:39 +0100 Subject: test: tst_qquickflickable::flickOnRelease() got fixed Task-number: QTBUG-26094 Task-number: QTBUG-65343 Change-Id: Iee5347227cc943ae6d5d9ba480c0fb8024d258aa Reviewed-by: Frederik Gladhorn Reviewed-by: Shawn Rutledge --- tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 6 ------ 1 file changed, 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())); } -- cgit v1.2.3