diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2024-12-18 09:48:20 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2024-12-19 08:37:06 +0100 |
| commit | 0f416cbaaba46ddb039bbf33e1d70dbe80821d57 (patch) | |
| tree | 641bb201b8d37dbf9e64dd7aff9002c1235f9f4f /src/corelib/serialization/qxmlstream.cpp | |
| parent | b815c6f7fd71086c97fe6e9aa9472154be5fcc57 (diff) | |
Protect QT_ENABLE_STRICT_MODE_UP_TO against predefined individual opt-outs [6.8]
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.9 6.8
Change-Id: I457457d1e60dbd9362b987157ba089adc67d1d6b
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/corelib/serialization/qxmlstream.cpp')
0 files changed, 0 insertions, 0 deletions