From eb628794c7bd7118f6345aefc6ae04ef6c616c7a Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Tue, 15 Feb 2022 17:11:26 +0100 Subject: Repair tst_qtreeview on Android Scroll tests relied on having a small window. On Android, the window can not be smaller than the screen. This patch changes the tests so that the windows have large enough content so scrolling can happen. Fixes: QTBUG-87408 Pick-to: 6.2 6.3 Change-Id: I26a444518fd934527089297c594673937f0ecf88 Reviewed-by: Assam Boudjelthia --- tests/auto/widgets/itemviews/qtreeview/BLACKLIST | 5 ----- tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST index 3aaf1e4e64..e69de29bb2 100644 --- a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST @@ -1,5 +0,0 @@ -# QTBUG-87408 -[horizontalScrollMode] -android -[setSelection] -android diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 0d6d80ad59..0e9c1459ee 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -890,8 +890,8 @@ void tst_QTreeView::horizontalScrollMode() QTreeView view; setFrameless(&view); view.setModel(&model); - view.setFixedSize(100, 100); - view.header()->resizeSection(0, 200); + view.setFixedSize(100, 1000); + view.header()->resizeSection(0, 2000); view.show(); QCOMPARE(view.horizontalScrollMode(), QAbstractItemView::ScrollPerPixel); @@ -2050,7 +2050,7 @@ void tst_QTreeView::setSelection() QFETCH(PointList, expectedItems); QFETCH(int, verticalOffset); - QtTestModel model(10, 5); + QtTestModel model(100, 5); model.levels = 1; model.setDecorationsEnabled(true); QTreeView view; -- cgit v1.2.3