From cb22c6ca0239462bc20ff4fddedcd596c9ea3f6a Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 31 Mar 2016 12:00:48 +0200 Subject: Revert "tst_drawer: blacklist test_swipeVelocity on OSX" This reverts commit 68eec20b69851e5c0901a186ad27fe56abac1745. It's not just OS X that fails, and tst_styles doesn't have a blacklist, so the test still causes integration failures for the material and universal styles. Rather than maintain two blacklist files, we'll just go back to skip(). Change-Id: I3d7536aa86189a238346cb2e73a601a227b2b409 Reviewed-by: Mitch Curtis --- tests/auto/controls/BLACKLIST | 3 --- tests/auto/controls/data/tst_drawer.qml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/controls/BLACKLIST b/tests/auto/controls/BLACKLIST index 5f1713e1..d4e90561 100644 --- a/tests/auto/controls/BLACKLIST +++ b/tests/auto/controls/BLACKLIST @@ -1,6 +1,3 @@ # QTBUG-52003 [SwipeDelegate::test_swipeVelocity] osx -# QTBUG-52003 -[Drawer::test_swipeVelocity] -osx diff --git a/tests/auto/controls/data/tst_drawer.qml b/tests/auto/controls/data/tst_drawer.qml index 6306de17..83e04187 100644 --- a/tests/auto/controls/data/tst_drawer.qml +++ b/tests/auto/controls/data/tst_drawer.qml @@ -75,6 +75,8 @@ TestCase { } function test_swipeVelocity() { + skip("QTBUG-52003"); + var control = rectDrawer.createObject(testCase) verify(control.contentItem) compare(control.edge, Qt.LeftEdge) -- cgit v1.2.3