diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-11 12:45:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 12:45:59 +0100 |
commit | 5ba29e1672dafe16be004409661aef3a7ebf499a (patch) | |
tree | 245105a3445adc98d53b4de58ed7ce1338539ae2 /tests/auto | |
parent | 1df2906c75f379a62bce487d3d2db3ade3095b16 (diff) | |
parent | 0c5953fd4edbb8e6495aaf288186dbd6737fb8c0 (diff) |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: Ic23e90146470d69060313628562f76a710696bab
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 5de0ca6c22..dfcaa9b5b9 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -313,17 +313,6 @@ public: endRemoveColumns(); } - void removeAddLastColumnLayoutChanged() // for taskQTBUG_41124 - { - // make sure QHeaderView::_q_layoutChanged() is called - emit layoutAboutToBeChanged(); - --cols; - emit layoutChanged(); - emit layoutAboutToBeChanged(); - ++cols; - emit layoutChanged(); - } - void removeAllColumns() { beginRemoveColumns(QModelIndex(), 0, cols - 1); @@ -1317,19 +1306,6 @@ void tst_QTreeView::columnHidden() for (int c = 0; c < model.columnCount(); ++c) QCOMPARE(view.isColumnHidden(c), true); view.update(); - - // QTBUG_41124: - // QHeaderViewPrivate::_q_layoutChanged was not called because it was - // disconnected in QTreeView::setModel(). _q_layoutChanged restores - // the hidden sections which is tested here - view.setColumnHidden(model.cols - 1, true); - model.removeAddLastColumnLayoutChanged(); - // we removed the last column and added a new one - // (with layoutToBeChanged/layoutChanged() for both) so column - // 1 is a new column and therefore must not be hidden when - // _q_layoutChanged() is called and is doing the right stuff - QCOMPARE(view.isColumnHidden(model.cols - 1), false); - } void tst_QTreeView::rowHidden() |