d328e8eaaf
Since some of the Qt opt-outs are defined project-wide by the buildsystem these days (e.g. QT_NO_FOREACH, QT_NO_JAVA_STYLE_ITERATOR, ...), a module that attempts to use QT_ENABLE_STRICT_MODE_UP_TO will hit warnings regarding re-definition of these macros (definition on the compiler command line, redefinition by qtconfigmacros.h). To fix, guard the #define QT_NO_FOO's with #ifndef QT_NO_FOO. Amends 3a6c8e02b6d1b0574da52b0087092d0c74aa92c1. Pick-to: 6.8 Change-Id: I457457d1e60dbd9362b987157ba089adc67d1d6b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 0f416cbaaba46ddb039bbf33e1d70dbe80821d57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>