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

Conflicts:
	src/widgets/widgets/qmenu.cpp

Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308

1 files changed, 5 insertions, 3 deletions

diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index ac03ed822b..20b160c03d 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -3888,9 +3888,11 @@ bool QHeaderViewPrivate::read(QDataStream &in)
     const int currentCount = (orient == Qt::Horizontal ? model->columnCount(root) : model->rowCount(root));
     if (newSectionItems.count() < currentCount) {
         // we have sections not in the saved state, give them default settings
-        for (int i = newSectionItems.count(); i < currentCount; ++i) {
-            visualIndicesIn.append(i);
-            logicalIndicesIn.append(i);
+        if (!visualIndicesIn.isEmpty() && !logicalIndicesIn.isEmpty()) {
+            for (int i = newSectionItems.count(); i < currentCount; ++i) {
+                visualIndicesIn.append(i);
+                logicalIndicesIn.append(i);
+            }
         }
         const int insertCount = currentCount - newSectionItems.count();
         const int insertLength = defaultSectionSizeIn * insertCount;