diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-05-11 11:53:02 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-05-12 11:21:01 +0000 |
| commit | 99ca47101471023361eef1764a29f085c288347c (patch) | |
| tree | 2c582952f47623f4c1996dfbbf0e6f5293c42da5 | |
| parent | d70205cd2ba9242e477856df853dcd7d7770425b (diff) | |
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| -rw-r--r-- | src/winmain/qtmain_winrt.cpp | 2 | ||||
| -rw-r--r-- | src/winmain/winmain.pro | 2 |
2 files changed, 3 insertions, 1 deletions
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 |