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/qglobal.cpp | |
| 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/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index c046b8078d..342fecb300 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1903,12 +1903,6 @@ bool qSharedBuild() noexcept \sa QT_DISABLE_DEPRECATED_BEFORE */ -#if defined(QT_BUILD_QMAKE) -// needed to bootstrap qmake -static const unsigned int qt_one = 1; -const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); -#endif - #if defined(Q_OS_MAC) QT_BEGIN_INCLUDE_NAMESPACE @@ -1982,13 +1976,8 @@ Q_GLOBAL_STATIC(QWindowsSockInit, winsockInit) static QString readVersionRegistryString(const wchar_t *subKey) { -#if !defined(QT_BUILD_QMAKE) - return QWinRegistryKey(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion)") + return QWinRegistryKey(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion)") .stringValue(subKey); -#else - Q_UNUSED(subKey); - return QString(); -#endif } static inline QString windows10ReleaseId() |