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

Conflicts:
	.qmake.conf
	examples/charts/dynamicspline/chart.cpp
	examples/charts/piechartdrilldown/main.cpp

Change-Id: I839e97bf377c7823f2f464c097656d58f279ed77

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/charts/barmodelmapper/customtablemodel.cpp b/examples/charts/barmodelmapper/customtablemodel.cpp
index 2caef9b5..71165dff 100644
--- a/examples/charts/barmodelmapper/customtablemodel.cpp
+++ b/examples/charts/barmodelmapper/customtablemodel.cpp
@@ -88,10 +88,10 @@ QVariant CustomTableModel::data(const QModelIndex &index, int role) const
     } else if (role == Qt::EditRole) {
         return m_data[index.row()]->at(index.column());
     } else if (role == Qt::BackgroundRole) {
-        QRect rect;
-        foreach (rect, m_mapping)
-        if (rect.contains(index.column(), index.row()))
-            return QColor(m_mapping.key(rect));
+        for (const QRect &rect : m_mapping) {
+            if (rect.contains(index.column(), index.row()))
+                return QColor(m_mapping.key(rect));
+        }
 
         // cell not mapped return white color
         return QColor(Qt::white);