From d8ce18b323f0eb8850177f86065f520bb555b5a4 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Mon, 16 Jan 2017 10:36:45 +0100 Subject: Quick: Remove last foreach, and mark QT_NO_FOREACH Longer term, we should QT_NO_FOREACH .qmake.conf, but a number of other parts of the codebase still use foreach. Change-Id: I105cdbe2a64ae40ffa53d3aaa8765b09195af841 Reviewed-by: Simon Hausmann --- src/quick/items/qquickitem.cpp | 2 +- src/quick/quick.pro | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 01737548c8..f7b9a58329 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -8389,7 +8389,7 @@ void QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine { QObjectWrapper::Data *This = static_cast(that); if (QQuickItem *item = static_cast(This->object())) { - foreach (QQuickItem *child, QQuickItemPrivate::get(item)->childItems) + for (QQuickItem *child : qAsConst(QQuickItemPrivate::get(item)->childItems)) QV4::QObjectWrapper::markWrapper(child, e); } QV4::QObjectWrapper::markObjects(that, e); diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 8f4f9a8290..eae9b09b2f 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -9,6 +9,8 @@ win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 win32:!winrt: LIBS += -luser32 +DEFINES += QT_NO_FOREACH + exists("qqml_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors LIBS_PRIVATE += -lgcov -- cgit v1.2.3