diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-09-16 14:37:16 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-11 06:04:54 +0000 |
| commit | 267dd9133d76d466c0f940e7286dc9ba03bac18e (patch) | |
| tree | 58a6ae2c915db69d99064901a8c54d341c9659a6 /src/corelib/global/qglobal.h | |
| parent | 91cde062968f97041bca8d2a30d13aa03b606c3d (diff) | |
Clean up building of bootstrap lib and tools
Add a qconfig-bootstrap.h, which contains all the defines required
to build the bootstrapped tools. This will be required anyway when
moving more code over to use QT_CONFIG(foo) instead of QT_NO_FOO.
Change-Id: I783d0aa0100b9190fe2d422bee4a95b05720aebe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index dd8b6110b3..8b67f0d3ef 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -56,7 +56,9 @@ */ #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#ifndef QT_BOOTSTRAPPED +#ifdef QT_BOOTSTRAPPED +#include <QtCore/qconfig-bootstrapped.h> +#else #include <QtCore/qconfig.h> #include <QtCore/qtcore-config.h> #endif |