diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:44:20 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:48:55 +0100 |
commit | e2a546a18be88f380b3d9d3efbed390fe1a9e93f (patch) | |
tree | f7a6a0c7a60ee7b771ee9d6256c385f761113135 /tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | |
parent | macOS: Copy QNSWindowProtocol without referencing it by name (diff) | |
parent | Prevent O(n^2) behavior when calling QObject::deleteLater (diff) | |
download | qtbase-e2a546a18be88f380b3d9d3efbed390fe1a9e93f.tar.xz qtbase-e2a546a18be88f380b3d9d3efbed390fe1a9e93f.zip |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I896b0cf54f317c4336cc3d3db319a0b89e421728
Diffstat (limited to 'tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp')
-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 4c6dd341b3..b2e1a2d9b5 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -332,17 +332,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); @@ -1337,19 +1326,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() |