diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2024-03-19 15:13:05 -0700 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2024-03-20 15:37:12 -0700 |
| commit | d98f22995d9f6a401fbf77ef3c33a3fa9c316a61 (patch) | |
| tree | 97ff4f246e13c56ab6f2e9d567ebce441eaad9bd /tests/auto/quick | |
| parent | 08f1d36913b15c10cf24366fb3f522074ffa75fd (diff) | |
Modify tst_FlickableInterop::touchDragSliderAndFlickable to pass
We have a behavior change since Qt 5: if one finger drags a DragHandler
in a child of a Flickable, a "stray" finger that touches the Flickable
does not flick it. Time will tell whether this is a good change or not.
But it's been that way in Qt 6 so far; and in the meantime it's best
not to keep this test blacklisted because of one line.
Pick-to: 6.5 6.7
Fixes: QTBUG-123490
Task-number: QTBUG-86729
Change-Id: Iad22211b4fe102c2c1d4d7f4c7485decc0aa17a8
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
Diffstat (limited to 'tests/auto/quick')
| -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) |