diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-28 16:06:26 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-25 16:08:43 +0100 |
| commit | 43c28aa9046967abeb4ad042c8be1aa23a19c282 (patch) | |
| tree | b8f4a53cd9aaaa819c853ee51e66ea100c1ae3d5 /src/corelib/global/qconfig-bootstrapped.h | |
| parent | 5a3bbb55851b84aa6a46c23e5a6fb33b4860edc6 (diff) | |
Use Core library for qmake instead of the Bootstrap library
Move the qmake-specific logic of the QLibraryInfo class to
qmake internals. 'qconfig.cpp.in' now stores information about
the library info entries to keep them consistent between qmake
and the Core library. qmake requires specific features enabled
in the Core library, so building qmake will be skipped if the
features are not enabled.
All flags directly related to the qmake have been removed from
Core lib.
Remove all bootstrap related sections from qmake CMakeLists.txt
Task-number: QTBUG-89369
Change-Id: I26de157d3bfd4a5526699296e9d46e1c180b89ae
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index b57511cb0a..4649395c5f 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -66,9 +66,7 @@ #define QT_NO_USING_NAMESPACE #define QT_NO_DEPRECATED -#ifndef QT_BUILD_QMAKE #define QT_NO_REGEXP -#endif // Keep feature-test macros in alphabetic order by feature name: #define QT_FEATURE_alloca 1 @@ -139,15 +137,7 @@ #define QT_FEATURE_zstd -1 #endif -#ifdef QT_BUILD_QMAKE -#define QT_FEATURE_commandlineparser -1 -#define QT_NO_COMPRESS -#define QT_JSON_READONLY -#define QT_FEATURE_settings 1 -#define QT_NO_STANDARDPATHS -#else #define QT_FEATURE_commandlineparser 1 #define QT_FEATURE_settings -1 -#endif #endif // QT_BOOTSTRAPPED |