diff options
-rw-r--r-- | tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST index 4e54331470..c4cfd085af 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST +++ b/tests/auto/quick/pointerhandlers/flickableinterop/BLACKLIST @@ -5,8 +5,6 @@ opensuse-leap windows gcc [touchDragFlickableBehindButton] windows gcc -[touchDragSliderAndFlickable] -* # QTBUG-86729 # QTBUG-95887 [mouseDragSlider] opensuse-leap diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp index fa30469a79..790c7c771e 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp +++ b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp @@ -628,7 +628,10 @@ void tst_FlickableInterop::touchDragSliderAndFlickable() QQuickTouchUtils::flush(window); qCDebug(lcPointerTests) << "step" << i << ": fingers @" << p1 << p2 << "is Flickable moving yet?" << flickable->isMoving(); } - QVERIFY(flickable->isMoving()); + // In Qt 6, Flickable doesn't see the second touchpoint, so it doesn't move. + // One way to see this is that Flickable is more immune to stray touches than it otherwise would be. + // But time will tell if we are missing out on something useful, which was possible in Qt 5 (QTBUG-123490). + QCOMPARE(flickable->isMoving(), false); qreal knobSliderXOffset = qAbs(knob->mapToScene(knob->clipRect().center()).toPoint().x() - slider->mapToScene(slider->clipRect().center()).toPoint().x()) - initialXOffset; if (knobSliderXOffset > 1) |