tst_qmake: compile with QT_NO_FOREACH

systemEnvironment(): the loop was iterating over a temporary; hold the
temporary in a local const auto variable and use ranged-for.

runCommand(): the container is a const&, the loop doesn't change the
container and the containers the method is called on aren't changed
during iteration.

Task-number: QTBUG-115839
Change-Id: I6687e5ff64ff8c2fa26e34abf4044b98718e65d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 3 insertions, 6 deletions

diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
index 6d046e66e3..8fe0566baa 100644
--- a/tests/auto/tools/qmake/CMakeLists.txt
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -17,8 +17,6 @@ qt_internal_add_test(tst_qmake
     SOURCES
         testcompiler.cpp testcompiler.h
         tst_qmake.cpp
-    NO_PCH_SOURCES
-        testcompiler.cpp # undef QT_NO_FOREACH
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/tools/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp
index e5a99ee224..4700b17a70 100644
--- a/tests/auto/tools/qmake/testcompiler.cpp
+++ b/tests/auto/tools/qmake/testcompiler.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
-
 #include "testcompiler.h"
 
 #include <QProcess>
@@ -106,7 +104,8 @@ static inline QStringList systemEnvironment()
 #ifdef Q_OS_WIN
     static QStringList result;
     if (result.isEmpty()) {
-        foreach (const QString &variable, QProcess::systemEnvironment()) {
+        const auto env = QProcess::systemEnvironment();
+        for (const QString &variable : env) {
             if (variable.startsWith(QStringLiteral("MAKEFLAGS="), Qt::CaseInsensitive)) {
                 qWarning("Removing environment setting '%s'", qPrintable(variable));
             } else {
@@ -125,7 +124,7 @@ bool TestCompiler::runCommand(const QString &cmd, const QStringList &args, bool
     QString dbg = cmd;
     if (dbg.contains(' '))
         dbg.prepend('"').append('"');
-    foreach (QString arg, args) {
+    for (QString arg : args) {
         if (arg.contains(' '))
             arg.prepend('"').append('"');
         dbg.append(' ').append(arg);