diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-31 12:00:48 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-31 10:41:02 +0000 |
| commit | cb22c6ca0239462bc20ff4fddedcd596c9ea3f6a (patch) | |
| tree | 710fe12cbdc97b7acf8b4f729136114af92befe6 /tests | |
| parent | efd47f6ae97bcf26cef9d9404d12ce7a1b56031f (diff) | |
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 <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_drawer.qml | 2 |
2 files changed, 2 insertions, 3 deletions
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) |