diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-12-08 12:32:43 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-12-08 12:56:06 +0100 |
commit | 51e02fdc02c3cc2dbf9d2ba0b3fb709a6cd4e32e (patch) | |
tree | d566a2f74a9a22f89f62595383e7f2c397505c73 | |
parent | 090f404cf80da35734f712b02cc1543acecd5b62 (diff) |
Stabilize tst_qquickmousearea::nestedStopAtBounds()
Fixes: QTBUG-78153
Change-Id: Ib8ab2ace4e43f5020059b964951ed11c0f7fc4bd
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r-- | tests/auto/quick/qquickmousearea/BLACKLIST | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST deleted file mode 100644 index f2cb00225b..0000000000 --- a/tests/auto/quick/qquickmousearea/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -# QTBUG-78153 -[nestedStopAtBounds] -opensuse-leap - diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 17553ee6c4..89216aec20 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -1885,7 +1885,7 @@ void tst_QQuickMouseArea::nestedStopAtBounds() QTest::mouseMove(&view, position); axis += invert ? threshold : -threshold; QTest::mouseMove(&view, position); - QCOMPARE(outer->drag()->active(), true); + QTRY_COMPARE(outer->drag()->active(), true); QCOMPARE(inner->drag()->active(), false); QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position); |