diff options
| author | Frédéric Lefebvre <frederic.lefebvre@qt.io> | 2025-06-24 17:04:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-07-10 19:52:08 +0000 |
| commit | 3810bc560f8b5d1913ddcf2d36e21e59ad8449a1 (patch) | |
| tree | 23bf64531221611500b582ddba0e4a9934453c13 | |
| parent | 56f5cd5425253c031184cbe53b655e785e353fa8 (diff) | |
Fix flaky dragHandlerInSiblingStealingGrabFromMouseAreaViaMouse
tst_MouseAreaInterop::
dragHandlerInSiblingStealingGrabFromMouseAreaViaMouse is flaky on
openSuSE 15.6 and is blacklisted on that platform.
Fix flakiness on openSuSE and unblacklist the test.
Change-Id: I1f0c8935a1b95d773cf5364ec4eba0c20918d41b
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit dc90dfad74b899b6b966549c19ebdd9b737765c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 79bef289da3afff314fe07f1caddf3a22bfb47f1)
(cherry picked from commit cee9f5ae0debbfb3ddaac56fc3b51db19b24f7b5)
(cherry picked from commit e33ab76fe145636e8fda6bdca3ed9b2abbb8bc94)
| -rw-r--r-- | tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST b/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST index 74d29b4ac3..cb290fe641 100644 --- a/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST +++ b/tests/auto/quick/pointerhandlers/mousearea_interop/BLACKLIST @@ -1,7 +1,3 @@ # QTBUG-95938 [dragHandlerInSiblingStealingGrabFromMouseAreaViaTouch] opensuse-leap - -# QTBUG-95938 -[dragHandlerInSiblingStealingGrabFromMouseAreaViaMouse] -opensuse-leap diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp index ea0b0252e4..6331a2d390 100644 --- a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp +++ b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp @@ -59,6 +59,10 @@ void tst_MouseAreaInterop::dragHandlerInSiblingStealingGrabFromMouseAreaViaMouse createView(windowPtr, "dragTakeOverFromSibling.qml"); QQuickView * window = windowPtr.data(); + const QPoint pos = QGuiApplication::primaryScreen()->availableGeometry().topLeft(); + window->setFramePosition(pos); + QTRY_COMPARE(window->framePosition(), pos); + QPointer<QQuickPointerHandler> handler = window->rootObject()->findChild<QQuickPointerHandler*>(); QVERIFY(handler); QQuickMouseArea *ma = window->rootObject()->findChild<QQuickMouseArea*>(); |