From 9beca767863739b4eccd642aeff296e2138032af Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Tue, 15 Feb 2022 14:17:12 +0100 Subject: Repair tst_qabstractitemview in case of no cursor tst_qabstractitemview requires a movable cursor. This patch skips the test if there is no movable cursor. Pick-to: 6.2 6.3 Fixes: QTBUG-87400 Change-Id: I4e917b2ad062ce068f23603410aa9209edb9828d Reviewed-by: Qt CI Bot Reviewed-by: Assam Boudjelthia --- tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST | 5 ----- .../widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST b/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST index 249c91c3c4..e69de29bb2 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST @@ -1,5 +0,0 @@ -[task200665_itemEntered] -macos # Can't move cursor (QTBUG-76312) -# QTBUG-87400 -[task200665_itemEntered] -android diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index c8af0b114a..869d552a4f 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1358,7 +1358,13 @@ void tst_QAbstractItemView::task200665_itemEntered() { if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); - + { + // skip if we can't move mouse + const QPoint cursorPos = QCursor::pos() + QPoint(10, 10); + QCursor::setPos(cursorPos); + if (!QTest::qWaitFor([cursorPos] { return QCursor::pos() == cursorPos; }, 500)) + QSKIP("Can't move mouse"); + } //we test that view will emit entered //when the scrollbar move but not the mouse itself QStandardItemModel model(1000, 1); -- cgit v1.2.3