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

Change-Id: I2d7a3f3a80e6287e135e55b650f74f9a540332bc

1 files changed, 5 insertions, 3 deletions

diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index e0e993ce77..76f80c680e 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -3876,9 +3876,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;