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

Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 5293ba487a..0eec2e7c75 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -339,6 +339,17 @@ 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);
@@ -1344,6 +1355,18 @@ 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()