diff options
author | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-22 16:24:19 +0100 |
---|---|---|
committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-03-15 21:05:31 +0100 |
commit | 50f6356f8ea949cc18afe309cd72e0ad2811ea95 (patch) | |
tree | ee6c34c6d818b233763e163295c2f4e4b3fa52d7 /tests/auto/widgets/itemviews/qtableview | |
parent | bbae5c891b8807399271a655f99a3c90882a0f9e (diff) |
Repair some of tst_qtableview tests on Android
The test task191545_dragSelectRows relied on the fact
that the view is not scrolling. But on a small screen,
it scrolls automatically.
Fixes: QTBUG-87407
Pick-to: 6.2 6.3
Change-Id: I691361c965ab03d8a012f2b83715c7c96d990ec5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/widgets/itemviews/qtableview')
-rw-r--r-- | tests/auto/widgets/itemviews/qtableview/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST index a5db44a827..ff870915be 100644 --- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST @@ -3,6 +3,3 @@ osx [mouseWheel:scroll down per pixel] macos -# QTBUG-87407 -[task191545_dragSelectRows] -android diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 21fb0b182a..a4b1c9bb63 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -4436,6 +4436,8 @@ void tst_QTableView::task191545_dragSelectRows() QCoreApplication::sendEvent(tableVp, &cellPressEvent); for (int i = 0; i < 6; ++i) { + // cellPos might have been updated by scrolling, so refresh + cellPos = table.visualRect(model.index(3+i, 3+i)).center(); cellPos.setX(cellPos.x() + cellRect.width()); cellPos.setY(cellPos.y() + cellRect.height()); QMouseEvent moveEvent(QEvent::MouseMove, cellPos, tableVp->mapToGlobal(cellPos), |