summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2022-02-15 17:11:26 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-16 23:06:32 +0000
commitbcb26dea5bcc3e8ca81b05884e3128a27ad4061a (patch)
treecbe4a3e42f55e1666a3f6fcff2af2925937a74c9
parent509c829310f41c0968798fec29b52dd1a0e1331d (diff)
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 Change-Id: I26a444518fd934527089297c594673937f0ecf88 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit eb628794c7bd7118f6345aefc6ae04ef6c616c7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/BLACKLIST5
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp6
2 files changed, 3 insertions, 8 deletions
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 579c2d234f..c8a67a759c 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;