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/winmain.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/winmain/winmain.pro') 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 From b67a0836d970d47498ef7eb1d59841b661cfae78 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 May 2016 17:53:58 +0200 Subject: QT_CONFIG simplification re debug_and_release and build_all don't pretend that these two flags can be set separately - the configures set them in tandem. Change-Id: Ib0beae0152de09026d4627fd3ae0feabd9ce1b81 Reviewed-by: Joerg Bornemann --- src/winmain/winmain.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/winmain/winmain.pro') diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index e8c9ace03b..52728a9149 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -8,7 +8,7 @@ DESTDIR = $$QT.core.libs CONFIG += static QT = core -contains(QT_CONFIG, build_all):CONFIG += build_all +contains(QT_CONFIG, debug_and_release): CONFIG += build_all win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi -- cgit v1.2.3