Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9

1 files changed, 0 insertions, 23 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 0eec2e7c75..5293ba487a 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -339,17 +339,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);
@@ -1355,18 +1344,6 @@ void tst_QTreeView::columnHidden()
     QCOMPARE(view.isColumnHidden(model.cols - 1), true);
     model.simulateMoveRows();
     QCOMPARE(view.isColumnHidden(model.cols - 1), true);
-
-    // 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()