From c377f4e9b72b11e8216dd5f4cc472258e4cfb578 Mon Sep 17 00:00:00 2001 From: Audun Sutterud Date: Mon, 7 Oct 2024 11:06:25 +0200 Subject: [PATCH] tst_QGraphicsWidget: Test the cursor Skip initStyleOption() if the cursor cannot be moved. Fixes: QTBUG-129545 Change-Id: I6a42314515ab3e32b79c8c123eb8769b8c2c8ecb Reviewed-by: Axel Spoerl --- tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST | 1 - .../graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST index 1425a384c2d..6ba683cf8c9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST @@ -1,5 +1,4 @@ [initStyleOption] -macos android b2qt # QTBUG-100930 diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index a97acbac82e..3a3753d72b7 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1085,8 +1085,10 @@ void tst_QGraphicsWidget::initStyleOption() } QFETCH(bool, underMouse); if (underMouse) { - QCursor::setPos(view.viewport()->mapToGlobal(view.mapFromScene(widget->mapToScene(widget->boundingRect().center())))); - QTest::qWait(100); + const auto pos = view.viewport()->mapToGlobal(view.mapFromScene(widget->mapToScene(widget->boundingRect().center()))); + QCursor::setPos(pos); + if (!QTest::qWaitFor([pos]{ return QCursor::pos() == pos; })) + QSKIP("Cannot move cursor"); } QFETCH(QPalette, palette);