1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect QT_ENABLE_STRICT_MODE_UP_TO against predefined individual opt-outs [6.9]

Browse Source 
Since some of the Qt opt-outs are defined project-wide by the
buildsystem these days (e.g. QT_NO_QSNPRINF, ...), 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 bd7d54249e3f2b6a9dd6b759c892d7c97d26c0aa (which was also picked
to 6.8).

Change-Id: I88276c9ed01edde1495105cf5bd1e07b1fd244f4
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 752de4a0aabc305af16251a55edf247e043b1b18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit da9ff584d1475dcfc92e6f6323eef82b145d853a)
This commit is contained in:
Marc Mutz 2024-12-18 09:48:20 +01:00 committed by Qt Cherry-pick Bot
parent 11a4ec7186
commit 7d9de89e75
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qtconfigmacros.h
View File

@ -227,7 +227,9 @@ namespace QT_NAMESPACE {}
#endif // 6.8.0
#if QT_ENABLE_STRICT_MODE_UP_TO >= QT_VERSION_CHECK(6, 9, 0)
# ifndef QT_NO_QSNPRINTF
# define QT_NO_QSNPRINTF
# endif
#endif // 6.9.0
#endif // QT_ENABLE_STRICT_MODE_UP_TO