AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enabled test and made it pass on Linux

Browse Source 
Task-number: QTBUG-20753, QTBUG-21424
Change-Id: Icc4abf82c243b31b43d167df921e0585a5e89a1e
Reviewed-on: http://codereview.qt-project.org/5553
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
This commit is contained in:
Jo Asplin 2011-09-26 16:54:50 +02:00 committed by Qt by Nokia
parent 4bbcbec3fa
commit 22a83f364e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qcombobox/qcombobox.pro
View File

@ -1,5 +1,3 @@
load(qttest_p4)
QT += widgets widgets-private gui-private core-private
SOURCES += tst_qcombobox.cpp
CONFIG += insignificant_test # QTBUG-21402

10
tests/auto/qcombobox/tst_qcombobox.cpp
View File

@ -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);