diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-05 18:34:26 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-06 14:26:25 +0200 |
| commit | f03f830e711ead302fa48ba67dc101a9a834d260 (patch) | |
| tree | 73ee9cd5a6a29e7185f1042667e0f9d4889ea07a /src/corelib/global | |
| parent | 91b85ec868dad8b7dc412d2c61ab59952263416f (diff) | |
Bootstrap: explicitly include stdlib.h to check for __GLIBC_PREREQ
Previously the code was relying on the includes in qglobal.h, but now
when we try to get rid of qglobal.h we can end up in a situation when
qconfig-bootstrap.h was first included before qglobal.h (__GLIBC_PREREQ
not defined), and also included once again after qglobal.h
(__GLIBC_PREREQ defined, at least on linux). This resulted in
redefenition of Qt features dependent on __GLIBC_PREREQ.
This patch fixes it by explicitly including the stdlib.h header which
will provide __GLIBC_PREREQ definition when it is available.
Task-number: QTBUG-107046
Change-Id: Idbf7a11151c5f81723131daf25c06ef454ff5cbb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 61fd6479b1..5d42facca3 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -23,6 +23,8 @@ #ifdef QT_BOOTSTRAPPED +#include <stdlib.h> // for __GLIBC_PREREQ + #ifndef QT_NO_EXCEPTIONS #define QT_NO_EXCEPTIONS #endif |