Eradicate Q_FOREACH loops and mark the module clean

The only noteworth change is where a loop around spy.events modified
the container using takeFirst(). There was no reason to do so, so it
was changed to use the loop variable instead of the result of taking.

Change-Id: I02c62a7c2efc5d042c6e669fe5daddd7da7e85d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
 
 

49 files changed, 71 insertions, 154 deletions

diff --git a/.qmake.conf b/.qmake.conf
index dba70a4fe..2d0105a62 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,6 @@ QT3D_BUILD_ROOT = $$shadowed($$PWD)
 
 load(qt_build_config)
 
+DEFINES += QT_NO_FOREACH
+
 MODULE_VERSION = 5.14.0
diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
index 160dc6a76..312dfa7e6 100644
--- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
+++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
@@ -62,8 +62,9 @@ bool TouchSettings::isHoverEnabled() const
 #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
     return false;
 #else
+    const auto devices = QTouchDevice::devices();
     bool isTouch = false;
-    foreach (const QTouchDevice *dev, QTouchDevice::devices())
+    for (const QTouchDevice *dev : devices)
         if (dev->type() == QTouchDevice::TouchScreen) {
             isTouch = true;
             break;
diff --git a/src/animation/animation.pro b/src/animation/animation.pro
index b7d08416c..9c5db68f2 100644
--- a/src/animation/animation.pro
+++ b/src/animation/animation.pro
@@ -4,9 +4,6 @@ DEFINES += QT3DANIMATION_LIBRARY
 
 MODULE = 3danimation
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 QT += core-private 3dcore-private 3drender 3drender-private
 
 include(frontend/frontend.pri)
diff --git a/src/core/core.pro b/src/core/core.pro
index 8e65fafab..b1ba54be2 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -3,9 +3,6 @@ MODULE     = 3dcore
 
 QT         = core-private gui-private network
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/extras/extras.pro b/src/extras/extras.pro
index 22c9fcb93..396c9aa91 100644
--- a/src/extras/extras.pro
+++ b/src/extras/extras.pro
@@ -4,9 +4,6 @@ QT      += core-private 3dcore 3dcore-private 3drender 3drender-private 3dinput
 
 DEFINES += QT3DEXTRAS_LIBRARY
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 load(qt_module)
 
 include (geometries/geometries.pri)
diff --git a/src/input/input.pro b/src/input/input.pro
index 73a571c9f..938e77643 100644
--- a/src/input/input.pro
+++ b/src/input/input.pro
@@ -5,9 +5,6 @@ DEFINES += QT3DINPUT_LIBRARY
 MODULE = 3dinput
 MODULE_PLUGIN_TYPES = 3dinputdevices
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 QT += core-private 3dcore-private
 
 include(frontend/frontend.pri)
diff --git a/src/logic/logic.pro b/src/logic/logic.pro
index 584b9af4b..0fa0f8d55 100644
--- a/src/logic/logic.pro
+++ b/src/logic/logic.pro
@@ -3,9 +3,6 @@ MODULE     = 3dlogic
 
 QT         = core-private gui-private 3dcore 3dcore-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/plugins/geometryloaders/default/default.pro b/src/plugins/geometryloaders/default/default.pro
index 6b5ae8f27..c126b5844 100644
--- a/src/plugins/geometryloaders/default/default.pro
+++ b/src/plugins/geometryloaders/default/default.pro
@@ -1,9 +1,6 @@
 TARGET = defaultgeometryloader
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     basegeometryloader_p.h \
 
diff --git a/src/plugins/geometryloaders/fbx/fbx.pro b/src/plugins/geometryloaders/fbx/fbx.pro
index a35035fad..a9c17d4e7 100644
--- a/src/plugins/geometryloaders/fbx/fbx.pro
+++ b/src/plugins/geometryloaders/fbx/fbx.pro
@@ -1,9 +1,6 @@
 TARGET = fbxgeometryloader
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     fbxgeometryloader.h \
 
diff --git a/src/plugins/geometryloaders/gltf/gltf.pro b/src/plugins/geometryloaders/gltf/gltf.pro
index da805fae1..815226b4e 100644
--- a/src/plugins/geometryloaders/gltf/gltf.pro
+++ b/src/plugins/geometryloaders/gltf/gltf.pro
@@ -1,9 +1,6 @@
 TARGET = gltfgeometryloader
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     gltfgeometryloader.h \
 
diff --git a/src/plugins/renderplugins/scene2d/scene2d.pro b/src/plugins/renderplugins/scene2d/scene2d.pro
index 4f7ae6ea9..2cb07756b 100644
--- a/src/plugins/renderplugins/scene2d/scene2d.pro
+++ b/src/plugins/renderplugins/scene2d/scene2d.pro
@@ -1,9 +1,6 @@
 TARGET = scene2d
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras 3dquickscene2d 3dquickscene2d-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     scene2dplugin.h
 
diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro
index 28abef2b8..f761db12e 100644
--- a/src/plugins/sceneparsers/assimp/assimp.pro
+++ b/src/plugins/sceneparsers/assimp/assimp.pro
@@ -3,9 +3,6 @@ QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras 3dan
 
 include(../../../3rdparty/assimp/assimp_dependency.pri)
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     assimphelpers.h \
     assimpimporter.h
diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro
index 0005bb727..8f0cc2fe0 100644
--- a/src/plugins/sceneparsers/gltf/gltf.pro
+++ b/src/plugins/sceneparsers/gltf/gltf.pro
@@ -1,9 +1,6 @@
 TARGET = gltfsceneimport
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     gltfimporter.h
 
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexport.pro b/src/plugins/sceneparsers/gltfexport/gltfexport.pro
index 9d9791732..9da330605 100644
--- a/src/plugins/sceneparsers/gltfexport/gltfexport.pro
+++ b/src/plugins/sceneparsers/gltfexport/gltfexport.pro
@@ -1,9 +1,6 @@
 TARGET = gltfsceneexport
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     gltfexporter.h
 
diff --git a/src/quick3d/imports/animation/importsanimation.pro b/src/quick3d/imports/animation/importsanimation.pro
index 7b637dd3c..734c5186b 100644
--- a/src/quick3d/imports/animation/importsanimation.pro
+++ b/src/quick3d/imports/animation/importsanimation.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquickrender 3dquickanimation 3dquick-private 3dquickanimation-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qt3dquick3danimationplugin.h
 
diff --git a/src/quick3d/imports/core/importscore.pro b/src/quick3d/imports/core/importscore.pro
index 4ff71488a..9ba6ac66d 100644
--- a/src/quick3d/imports/core/importscore.pro
+++ b/src/quick3d/imports/core/importscore.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qt3dquick3dcoreplugin.h
 
diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro
index ea5b39a89..1ac629422 100644
--- a/src/quick3d/imports/extras/importsextras.pro
+++ b/src/quick3d/imports/extras/importsextras.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic 3dquickextras 3dquickextras-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qt3dquick3dextrasplugin.h
 
diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro
index 2b0dd0354..ec333f992 100644
--- a/src/quick3d/imports/input/importsinput.pro
+++ b/src/quick3d/imports/input/importsinput.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 OTHER_FILES += qmldir
 
 HEADERS += \
diff --git a/src/quick3d/imports/logic/importslogic.pro b/src/quick3d/imports/logic/importslogic.pro
index 955a4fd61..2fc2accc5 100644
--- a/src/quick3d/imports/logic/importslogic.pro
+++ b/src/quick3d/imports/logic/importslogic.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml 3dcore 3dlogic
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 OTHER_FILES += qmldir
 
 HEADERS += \
diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro
index a8d68c8ee..977668c40 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += core-private qml qml-private 3dcore 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qt3dquick3drenderplugin.h
 
diff --git a/src/quick3d/imports/scene2d/importsscene2d.pro b/src/quick3d/imports/scene2d/importsscene2d.pro
index 1582d4ee4..cb87f4ca9 100644
--- a/src/quick3d/imports/scene2d/importsscene2d.pro
+++ b/src/quick3d/imports/scene2d/importsscene2d.pro
@@ -5,9 +5,6 @@ IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic 3dquickscene2d 3dquickscene2d-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qtquickscene2dplugin.h \
 
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro
index a8ad8f417..a97dac09a 100644
--- a/src/quick3d/imports/scene3d/importsscene3d.pro
+++ b/src/quick3d/imports/scene3d/importsscene3d.pro
@@ -9,9 +9,6 @@ qtConfig(qt3d-input): QT += 3dinput
 qtConfig(qt3d-logic): QT += 3dlogic
 qtConfig(qt3d-animation): QT += 3danimation
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 HEADERS += \
     qtquickscene3dplugin.h \
     scene3dlogging_p.h \
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index c6c4f65c0..b7edec507 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -3,9 +3,6 @@ MODULE   = 3dquick
 
 QT      += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3danimation/quick3danimation.pro b/src/quick3d/quick3danimation/quick3danimation.pro
index 946c6c78d..4b166327f 100644
--- a/src/quick3d/quick3danimation/quick3danimation.pro
+++ b/src/quick3d/quick3danimation/quick3danimation.pro
@@ -4,9 +4,6 @@ MODULE   = 3dquickanimation
 QT      += core core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro
index bf28b4e4c..f7c956f8a 100644
--- a/src/quick3d/quick3dextras/quick3dextras.pro
+++ b/src/quick3d/quick3dextras/quick3dextras.pro
@@ -5,9 +5,6 @@ QT      += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-priv
 
 CONFIG -= precompile_header
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
index a05c2190f..e797f3fae 100644
--- a/src/quick3d/quick3dinput/quick3dinput.pro
+++ b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -4,9 +4,6 @@ MODULE   = 3dquickinput
 QT      += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private
 CONFIG -= precompile_header
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index 6db744984..4c158a7b7 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -4,9 +4,6 @@ MODULE   = 3dquickrender
 QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/quick3d/quick3dscene2d/quick3dscene2d.pro b/src/quick3d/quick3dscene2d/quick3dscene2d.pro
index fb599187b..b0596e8de 100644
--- a/src/quick3d/quick3dscene2d/quick3dscene2d.pro
+++ b/src/quick3d/quick3dscene2d/quick3dscene2d.pro
@@ -4,9 +4,6 @@ MODULE   = 3dquickscene2d
 QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/render/render.pro b/src/render/render.pro
index ea5ce7dc5..55303fa83 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -20,9 +20,6 @@ include (services/services.pri)
 include (texture/texture.pri)
 include (renderers/renderers.pri)
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/src/render/renderers/opengl/opengl.pri b/src/render/renderers/opengl/opengl.pri
index 22a32d30f..908c23c80 100644
--- a/src/render/renderers/opengl/opengl.pri
+++ b/src/render/renderers/opengl/opengl.pri
@@ -6,9 +6,6 @@ include (textures/textures.pri)
 include (graphicshelpers/graphicshelpers.pri)
 include (renderstates/renderstates.pri)
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES += QT_NO_FOREACH
-
 gcov {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
diff --git a/tests/auto/core/common/testpostmanarbiter.cpp b/tests/auto/core/common/testpostmanarbiter.cpp
index 59c59f5ab..ffc5bce5f 100644
--- a/tests/auto/core/common/testpostmanarbiter.cpp
+++ b/tests/auto/core/common/testpostmanarbiter.cpp
@@ -83,7 +83,8 @@ Qt3DCore::QAbstractPostman *TestArbiter::postman() const
 void TestArbiter::setArbiterOnNode(Qt3DCore::QNode *node)
 {
     Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
-    Q_FOREACH (Qt3DCore::QNode *n, node->childNodes())
+    const auto childNodes = node->childNodes();
+    for (Qt3DCore::QNode *n : childNodes)
         setArbiterOnNode(n);
 }
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index dad66c5d5..d8ffbc361 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -1054,23 +1054,22 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
 
     // WHEN
     spy.events.clear();
-    Q_FOREACH (QObject *c, root->children())
-        delete c;
+    qDeleteAll(root->children());
 
     // THEN
     QVERIFY(root->children().count() == 0);
     QCOMPARE(spy.events.size(), 20);
     int i = 0;
-    Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) {
+    for (const ObserverSpy::ChangeRecord &r : qAsConst(spy.events)) {
         QVERIFY(r.wasLocked());
         const Qt3DCore::QNodeId childId = childIds.at(i / 2);
         if (i % 2 == 0) {
-            Qt3DCore::QPropertyNodeRemovedChangePtr additionEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
+            Qt3DCore::QPropertyNodeRemovedChangePtr additionEvent = r.change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
             QCOMPARE(additionEvent->subjectId(), root->id());
             QCOMPARE(additionEvent->removedNodeId(), childId);
             QCOMPARE(additionEvent->metaObject(), &MyQNode::staticMetaObject);
         } else {
-            const Qt3DCore::QNodeDestroyedChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeDestroyedChange>();
+            const Qt3DCore::QNodeDestroyedChangePtr event = r.change().dynamicCast<Qt3DCore::QNodeDestroyedChange>();
             QCOMPARE(event->subjectId(), childId);
             QCOMPARE(event->subtreeIdsAndTypes().count(), 1);
             QCOMPARE(event->subtreeIdsAndTypes().first().id, childId);
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 4beb28bc2..6574a91d9 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -411,12 +411,12 @@ void tst_QChangeArbiter::registerObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
 
     child->setParent(root);
     arbiter->syncChanges();
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QCOMPARE(o->lastChanges().size(), 1);
         QVERIFY(o->lastChanges().last()->type() == Qt3DCore::PropertyValueAdded);
     }
@@ -462,9 +462,9 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         QVERIFY(s->lastChange().isNull());
 
     // WHEN
@@ -472,11 +472,11 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -486,11 +486,11 @@ void tst_QChangeArbiter::registerSceneObserver()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -527,7 +527,7 @@ void tst_QChangeArbiter::unregisterObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
 
     // WHEN
@@ -535,20 +535,20 @@ void tst_QChangeArbiter::unregisterObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
 
     // WHEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         arbiter->unregisterObserver(o, root->id());
 
     root->sendAllChangesNotification();
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
@@ -594,9 +594,9 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers)
+    for (tst_SimpleObserver *o : qAsConst(observers))
         QVERIFY(o->lastChange().isNull());
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         QVERIFY(s->lastChange().isNull());
 
     // WHEN
@@ -604,11 +604,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -618,11 +618,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
@@ -632,16 +632,16 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueRemoved);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeDeleted);
     }
 
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers)
+    for (tst_SceneObserver *s : qAsConst(sceneObservers))
         arbiter->unregisterSceneObserver(s);
 
     // WHEN
@@ -649,11 +649,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     arbiter->syncChanges();
 
     // THEN
-    Q_FOREACH (tst_SimpleObserver *o, observers) {
+    for (tst_SimpleObserver *o : qAsConst(observers)) {
         QVERIFY(!o->lastChange().isNull());
         QVERIFY(o->lastChange()->type() == Qt3DCore::PropertyValueAdded);
     }
-    Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
+    for (tst_SceneObserver *s : qAsConst(sceneObservers)) {
         QVERIFY(!s->lastChange().isNull());
         QVERIFY(s->lastChange()->type() == Qt3DCore::NodeDeleted);
     }
diff --git a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
index 0f50b5d38..3d2355eb8 100644
--- a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
+++ b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
@@ -605,7 +605,7 @@ void tst_QFrameAllocator::allocateSubclass()
 
     QCOMPARE(composeds.count(), 256);
 
-    Q_FOREACH (composed *c, composeds) {
+    for (composed *c : qAsConst(composeds)) {
         subclass *s = static_cast<subclass *>(c);
         s->toto = 2586.0f;
     }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 36ec14b4e..0a7e6d9b8 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -120,18 +120,18 @@ void tst_QScene::addObservable()
     for (int i = 0; i < 5; i++)
         scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
-    Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
+    const Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
+    const Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     // THEN
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
-    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs1) {
+    for (Qt3DCore::QObservableInterface *o : obs1) {
         QVERIFY(scene->nodeIdFromObservable(o) == node1->id());
         QVERIFY(scene->lookupNode(node1->id()) == nullptr);
     }
-    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs2) {
+    for (Qt3DCore::QObservableInterface *o : obs2) {
         QVERIFY(scene->nodeIdFromObservable(o) == node2->id());
         QVERIFY(scene->lookupNode(node2->id()) == nullptr);
     }
@@ -153,7 +153,7 @@ void tst_QScene::addNodeObservable()
         scene->addObservable(nodes.at(i));
 
     // THEN
-    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
+    for (Qt3DCore::QNode *n : qAsConst(nodes)) {
         QVERIFY(n == scene->lookupNode(n->id()));
         QVERIFY(scene->lookupObservables(n->id()).isEmpty());
     }
@@ -281,7 +281,7 @@ void tst_QScene::addChildNode()
     QCoreApplication::processEvents();
 
     // THEN
-    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
+    for (Qt3DCore::QNode *n : qAsConst(nodes)) {
         QVERIFY(scene->lookupNode(n->id()) == n);
     }
 }
diff --git a/tests/auto/coretest/coretest.pro b/tests/auto/coretest/coretest.pro
index 9bcc56c1b..9a96dcc6f 100644
--- a/tests/auto/coretest/coretest.pro
+++ b/tests/auto/coretest/coretest.pro
@@ -2,7 +2,7 @@ TARGET = Qt3DCoreTest
 MODULE = 3dcoretest
 CONFIG += static internal_module
 
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
+DEFINES += QT_NO_CAST_FROM_ASCII
 PRECOMPILED_HEADER =
 INCLUDEPATH += $$PWD
 
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 123a648d6..0588a14e9 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -100,7 +100,7 @@ private slots:
     void checkInitialAndCleanUpState()
     {
         // GIVEN
-        QFETCH(QList<QComponent*>, components);
+        QFETCH(const QList<QComponent*>, components);
 
         TestRenderer renderer;
         NodeManagers nodeManagers;
@@ -125,7 +125,7 @@ private slots:
         QVERIFY(entity.layerIds().isEmpty());
 
         // WHEN
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             const auto addChange = QComponentAddedChangePtr::create(&dummyFrontendEntity, component);
             entity.sceneChangeEvent(addChange);
         }
@@ -382,7 +382,7 @@ private slots:
     void shouldHandleComponentsEvents()
     {
         // GIVEN
-        QFETCH(QList<QComponent*>, components);
+        QFETCH(const QList<QComponent*>, components);
         QFETCH(void*, functionPtr);
         UuidListMethod method = reinterpret_cast<UuidListMethod>(functionPtr);
 
@@ -395,14 +395,14 @@ private slots:
         QVERIFY(method(&entity).isEmpty());
 
         // WHEN
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             const auto addChange = QComponentAddedChangePtr::create(&dummyFrontendEntity, component);
             entity.sceneChangeEvent(addChange);
         }
 
         // THEN
         QCOMPARE(method(&entity).size(), components.size());
-        Q_FOREACH (QComponent *component, components) {
+        for (QComponent *component : components) {
             QVERIFY(method(&entity).contains(component->id()));
         }
         QVERIFY(renderer.dirtyBits() != 0);
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index 7e288b02a..82ca8448f 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -123,7 +123,8 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer()
     QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count());
 
     int c = 0;
-    Q_FOREACH (QParameter *p, frontendMaterial->parameters())
+    const auto frontendMaterialParameters = frontendMaterial->parameters();
+    for (QParameter *p : frontendMaterialParameters)
         QCOMPARE(p->id(), backend.parameters().at(c++));
 
     delete frontendMaterial;
diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp
index d14bcddcb..9178b9d6f 100644
--- a/tests/auto/render/raycasting/tst_raycasting.cpp
+++ b/tests/auto/render/raycasting/tst_raycasting.cpp
@@ -182,13 +182,13 @@ void tst_RayCasting::shouldReturnAllResults()
                                  &provider));
 
     // WHEN
-    QVector<QCollisionQueryResult> results = service.fetchAllResults();
+    const QVector<QCollisionQueryResult> results = service.fetchAllResults();
 
     // THEN
     bool expectedHandlesFound = true;
-    Q_FOREACH (QQueryHandle expected, handles) {
+    for (QQueryHandle expected : qAsConst(handles)) {
         bool found = false;
-        Q_FOREACH (QCollisionQueryResult result, results) {
+        for (QCollisionQueryResult result : results) {
             if (result.handle() == expected)
                 found = true;
         }
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
index 247c5e0a3..931778c6e 100644
--- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
@@ -58,7 +58,7 @@ private:
                                Qt3DRender::Render::ShaderDataManager *manager)
     {
         // Create children first
-        Q_FOREACH (QObject *c, frontend->children()) {
+        for (QObject *c : frontend->children()) {
             Qt3DRender::QShaderData *cShaderData = qobject_cast<Qt3DRender::QShaderData *>(c);
             if (cShaderData)
                 initBackendShaderData(cShaderData, manager);
diff --git a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
index fa1cdd0de..3e7028bbd 100644
--- a/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
+++ b/tests/auto/render/trianglesextractor/tst_trianglesextractor.cpp
@@ -95,7 +95,7 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer()
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -104,7 +104,7 @@ Qt3DRender::QGeometryRenderer *customIndexedGeometryRenderer()
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
@@ -237,7 +237,7 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer()
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -258,7 +258,7 @@ Qt3DRender::QGeometryRenderer *customNonIndexedGeometryRenderer()
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
diff --git a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
index 91b8f887d..d6aca6219 100644
--- a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
+++ b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
@@ -62,7 +62,7 @@ void benchmarkAlloc()
             items[i] = allocator.allocate< Object<Size> >();
         }
     }
-    foreach (Object<Size>* item, items) {
+    for (Object<Size>* item : qAsConst(items)) {
         allocator.deallocate(item);
     }
 }
@@ -76,7 +76,7 @@ void benchmarkDealloc()
         items[i] = allocator.allocate< Object<Size> >();
     }
     QBENCHMARK_ONCE {
-        foreach (Object<Size>* item, items) {
+        for (Object<Size>* item : qAsConst(items)) {
             allocator.deallocate(item);
         }
     }
diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
index 0813fff91..870a256c9 100644
--- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
@@ -75,7 +75,7 @@ void benchmarkReleaseResources()
     }
 
     QBENCHMARK_ONCE {
-        foreach (auto ptr, resources) {
+        for (auto ptr : qAsConst(resources)) {
             allocator.releaseResource(ptr);
         }
     }
diff --git a/tests/manual/assimp/main.cpp b/tests/manual/assimp/main.cpp
index 5df575e32..307ff87c2 100644
--- a/tests/manual/assimp/main.cpp
+++ b/tests/manual/assimp/main.cpp
@@ -85,8 +85,8 @@ QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString
 QObject *SceneHelper::findComponent(Qt3DCore::QEntity *entity, const QString &componentMetatype)
 {
     Q_ASSERT(entity);
-    Qt3DCore::QComponentVector components = entity->components();
-    Q_FOREACH (Qt3DCore::QComponent *component, components) {
+    const Qt3DCore::QComponentVector components = entity->components();
+    for (Qt3DCore::QComponent *component : components) {
         qDebug() << component->metaObject()->className();
         if (component->metaObject()->className() == componentMetatype) {
             return component;
diff --git a/tests/manual/custom-mesh-cpp-indirect/main.cpp b/tests/manual/custom-mesh-cpp-indirect/main.cpp
index bac4a7227..e967a5375 100644
--- a/tests/manual/custom-mesh-cpp-indirect/main.cpp
+++ b/tests/manual/custom-mesh-cpp-indirect/main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -179,7 +179,7 @@ int main(int argc, char* argv[])
         float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
         int idx = 0;
 
-        Q_FOREACH (const QVector3D &v, vertices) {
+        for (const QVector3D &v : vertices) {
             rawVertexArray[idx++] = v.x();
             rawVertexArray[idx++] = v.y();
             rawVertexArray[idx++] = v.z();
diff --git a/tests/manual/custom-mesh-cpp/main.cpp b/tests/manual/custom-mesh-cpp/main.cpp
index e51321e65..7b70ba624 100644
--- a/tests/manual/custom-mesh-cpp/main.cpp
+++ b/tests/manual/custom-mesh-cpp/main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -158,7 +158,7 @@ int main(int argc, char* argv[])
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
diff --git a/tests/manual/custom-mesh-update-data-cpp/main.cpp b/tests/manual/custom-mesh-update-data-cpp/main.cpp
index 80ee2088d..3d9507049 100644
--- a/tests/manual/custom-mesh-update-data-cpp/main.cpp
+++ b/tests/manual/custom-mesh-update-data-cpp/main.cpp
@@ -167,7 +167,7 @@ int main(int argc, char* argv[])
     QVector3D blue(0.0f, 0.0f, 1.0f);
     QVector3D white(1.0f, 1.0f, 1.0f);
 
-    QVector<QVector3D> vertices = QVector<QVector3D>()
+    const QVector<QVector3D> vertices = QVector<QVector3D>()
             << v0 << n0 << red
             << v1 << n1 << blue
             << v2 << n2 << green
@@ -176,7 +176,7 @@ int main(int argc, char* argv[])
     float *rawVertexArray = reinterpret_cast<float *>(vertexBufferData.data());
     int idx = 0;
 
-    Q_FOREACH (const QVector3D &v, vertices) {
+    for (const QVector3D &v : vertices) {
         rawVertexArray[idx++] = v.x();
         rawVertexArray[idx++] = v.y();
         rawVertexArray[idx++] = v.z();
@@ -287,12 +287,12 @@ void TimerObject::timeout()
     QVector3D c2(qFabs(qSin(angle)), qFabs(qCos(angle + M_PI_4)), qFabs(qSin(angle + M_PI_4)));
     QVector3D c3(qFabs(qSin(angle + M_PI_4)), qFabs(qSin(angle)), qFabs(qCos(angle)));
 
-    QVector<QVector3D> colors = QVector<QVector3D>() << c1 << c2 << c3;
+    const QVector<QVector3D> colors = QVector<QVector3D>() << c1 << c2 << c3;
 
     float *rawVertexArray = reinterpret_cast<float *>(updateData.data());
 
     int pos = 6 * sizeof(float); //color offset
-    Q_FOREACH (const QVector3D &v, colors) {
+    for (const QVector3D &v : colors) {
         rawVertexArray[0] = v.x();
         rawVertexArray[1] = v.y();
         rawVertexArray[2] = v.z();
diff --git a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
index 48f8ad3fe..d069d609d 100644
--- a/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/tests/manual/deferred-renderer-cpp/deferredrenderer.cpp
@@ -85,13 +85,13 @@ void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera)
 
 void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
+    for (Qt3DRender::QFilterKey *c : qAsConst(criteria))
         m_geometryPassFilter->addMatch(c);
 }
 
 void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
+    for (Qt3DRender::QFilterKey *c : qAsConst(criteria))
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro
index df6dfa202..c40016015 100644
--- a/tools/qgltf/qgltf.pro
+++ b/tools/qgltf/qgltf.pro
@@ -1,8 +1,5 @@
 option(host_build)
 
-# Qt3D is free of Q_FOREACH - make sure it stays that way:
-DEFINES *= QT_NO_FOREACH
-
 SOURCES = qgltf.cpp
 
 include(../../src/3rdparty/assimp/assimp_dependency.pri)