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

Conflicts:
	.qmake.conf

Change-Id: I7a5a180e1da90479d25ec320448109072ac43e8f

4 files changed, 5 insertions, 7 deletions

diff --git a/.qmake.conf b/.qmake.conf
index b1c22d3..092f7d7 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,5 @@
 load(qt_build_config)
 
+DEFINES += QT_NO_FOREACH
+
 MODULE_VERSION = 5.9.0
diff --git a/examples/macextras/macpasteboardmime/main.cpp b/examples/macextras/macpasteboardmime/main.cpp
index 7cb5e3e..f747e02 100644
--- a/examples/macextras/macpasteboardmime/main.cpp
+++ b/examples/macextras/macpasteboardmime/main.cpp
@@ -91,11 +91,7 @@ public:
         Q_UNUSED(mime);
         Q_UNUSED(flav);
 
-        QByteArray all;
-        foreach (QByteArray i, data) {
-            all += i;
-        }
-        return QVariant(all);
+        return QVariant(data.join());
     }
 
     QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav)
diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm
index c5156b2..1881c4f 100644
--- a/src/macextras/qmactoolbar.mm
+++ b/src/macextras/qmactoolbar.mm
@@ -312,7 +312,7 @@ QMacToolBarPrivate::~QMacToolBarPrivate()
 NSMutableArray *QMacToolBarPrivate::getItemIdentifiers(const QList<QMacToolBarItem *> &items, bool cullUnselectable)
 {
     NSMutableArray *array = [[NSMutableArray alloc] init];
-    foreach (const QMacToolBarItem * item, items) {
+    for (const QMacToolBarItem * item : items) {
         if (cullUnselectable && item->selectable() == false)
             continue;
         [array addObject : item->d_func()->itemIdentifier()];
diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm
index 05986ff..23e5150 100644
--- a/src/macextras/qmactoolbardelegate.mm
+++ b/src/macextras/qmactoolbardelegate.mm
@@ -52,7 +52,7 @@ QT_USE_NAMESPACE
 NSArray *toNSArray(const QList<QString> &stringList)
 {
     NSMutableArray *array = [[NSMutableArray alloc] init];
-    foreach (const QString &string, stringList) {
+    for (const QString &string : stringList) {
         [array addObject:string.toNSString()];
     }
     return array;