From 99ca47101471023361eef1764a29f085c288347c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 11 May 2016 11:53:02 +0200 Subject: winmain: port the last remaining Q_FOREACH loop and add QT_NO_FOREACH Port the last remaining Q_FOREACH (over a QVarLengthArray, no less) in winmain to C++11 range-for and mark the library as Q_FOREACH-free, using QT_NO_FOREACH. Change-Id: Ic561080f7dd61d1d853ceb9e211c9b8a23bf05a5 Reviewed-by: Friedemann Kleint Reviewed-by: Maurice Kalinowski --- src/winmain/qtmain_winrt.cpp | 2 +- src/winmain/winmain.pro | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/winmain') diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index e2046b1106..1ac0a98cb1 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -298,7 +298,7 @@ private: bool develMode = false; bool debugWait = false; - foreach (const char *arg, args) { + for (const char *arg : args) { if (strcmp(arg, "-qdevel") == 0) develMode = true; if (strcmp(arg, "-qdebug") == 0) diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index e8c9ace03b..4dab828eae 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -8,6 +8,8 @@ DESTDIR = $$QT.core.libs CONFIG += static QT = core +DEFINES += QT_NO_FOREACH + contains(QT_CONFIG, build_all):CONFIG += build_all win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi -- cgit v1.2.3