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/qsysinfo.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/qsysinfo.h')
-rw-r--r-- | src/corelib/global/qsysinfo.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 89e761c662..04379ecd7e 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -57,18 +57,9 @@ public: WordSize = (sizeof(void *)<<3) }; -#if defined(QT_BUILD_QMAKE) enum Endian { BigEndian, LittleEndian - }; - /* needed to bootstrap qmake */ - static const int ByteOrder; -#elif defined(Q_BYTE_ORDER) - enum Endian { - BigEndian, - LittleEndian - # ifdef Q_QDOC , ByteOrder = BigEndian or LittleEndian # elif Q_BYTE_ORDER == Q_BIG_ENDIAN @@ -79,7 +70,6 @@ public: # error "Undefined byte order" # endif }; -#endif static QString buildCpuArchitecture(); static QString currentCpuArchitecture(); |