From 633a0f51720d149acf5dcddc8debc1f457fff835 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 13 Mar 2018 19:53:27 +0100 Subject: [PATCH] Fix tst_QTreeView - setSortingEnabledChild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QTreeView is stretching the last section by default which was not considered in this test. It worked by accident on linux because there the default section size is 100 and the default window width is also 100. On windows this was not the case and therefore the test failed. Task-number: QTBUG-51149 Change-Id: I9be1c1e942fc19817713773fe29d4afa93d73232 Reviewed-by: Thorbjørn Lund Martsum --- tests/auto/widgets/itemviews/qtreeview/BLACKLIST | 2 -- tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 tests/auto/widgets/itemviews/qtreeview/BLACKLIST diff --git a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST deleted file mode 100644 index 5eb80007c4..0000000000 --- a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[setSortingEnabledChild] -windows diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 347d2a81e6..37402d8a58 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -2600,8 +2600,10 @@ void tst_QTreeView::setSortingEnabledChild() { QMainWindow win; QTreeView view; - QStandardItemModel model(1,1); + // two columns to not get in trouble with stretchLastSection + QStandardItemModel model(1,2); view.setModel(&model); + view.header()->setDefaultSectionSize(92); win.setCentralWidget(&view); const int size = view.header()->sectionSize(0); view.setSortingEnabled(true);