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

Conflicts:
	.qmake.conf

Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1

1 files changed, 3 insertions, 3 deletions

diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 110275fd..e435417b 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -738,9 +738,9 @@ QPair<GLfloat, GLfloat> QBarDataProxyPrivate::limitValues(int startRow, int endR
     for (int i = startRow; i <= endRow; i++) {
         QBarDataRow *row = m_dataArray->at(i);
         if (row) {
-            endColumn = qMin(endColumn, row->size() - 1);
-            for (int j = startColumn; j <= endColumn; j++) {
-                const QBarDataItem &item = m_dataArray->at(i)->at(j);
+            int lastColumn = qMin(endColumn, row->size() - 1);
+            for (int j = startColumn; j <= lastColumn; j++) {
+                const QBarDataItem &item = row->at(j);
                 float itemValue = item.value();
                 if (limits.second < itemValue)
                     limits.second = itemValue;