summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/qcombobox/qcombobox.pro2
-rw-r--r--tests/auto/qcombobox/tst_qcombobox.cpp10
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index 18b2826710..7f5b57c237 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -1,5 +1,3 @@
load(qttest_p4)
QT += widgets widgets-private gui-private core-private
SOURCES += tst_qcombobox.cpp
-
-CONFIG += insignificant_test # QTBUG-21402
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index 0444d46a43..5ca2c893c2 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -2476,7 +2476,11 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
QSKIP("When calling cursor function, Windows CE responds with: This function is not supported on this system.", SkipAll);
#endif
- QCursor::setPos(combo.view()->mapToGlobal(combo.view()->rect().center()));
+ // Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA:
+ const QPoint target(combo.view()->mapToGlobal(combo.view()->rect().center()));
+ QCursor::setPos(QPoint(target.x() + 1, target.y()));
+ QCursor::setPos(target);
+
QTest::qWait(200);
#define GET_SELECTION(SEL) \
@@ -2487,10 +2491,6 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
int selection;
GET_SELECTION(selection);
-#ifdef Q_WS_QPA
- QEXPECT_FAIL("", "QTBUG-20753 QCursor::setPos doesn't work for qpa", Abort);
-#endif
-
//since we moved the mouse is in the middle it should even be around 5;
QVERIFY(selection > 3);