diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-09 01:01:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-09 12:22:24 +0000 |
| commit | 8182a8044f3b9e6c25c3b50b1c7f34d2900a3207 (patch) | |
| tree | 22489011cb506ada47b8a71d403d3f128bad4f10 /tests/auto/quick/qquickmousearea | |
| parent | 3c4247e1e021b6bcc480afc0716e0231575d0501 (diff) | |
| parent | 51e02fdc02c3cc2dbf9d2ba0b3fb709a6cd4e32e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/common/qv4compileddata_p.h
Change-Id: I1150c8cd0161f0e22137d383013751394ae64e18
Diffstat (limited to 'tests/auto/quick/qquickmousearea')
| -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 cb8aaaecb6..6efa2e6b3a 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -1887,7 +1887,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); |