diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index f4bdc69ac0a..9a41b24b9be 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -359,6 +359,8 @@ bool QOperatingSystemVersionBase::isAnyOfType(std::initializer_list type return std::find(types.begin(), types.end(), type) != types.end(); } +#ifndef QT_BOOTSTRAPPED + /*! \variable QOperatingSystemVersion::Windows7 \brief a version corresponding to Windows 7 (version 6.1). @@ -691,7 +693,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::Android11 = \since 6.5 */ - +#endif // !QT_BOOTSTRAPPED #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug debug, const QOperatingSystemVersion &ov) diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 6db88c39b5f..1e4eb5cc49d 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -105,7 +105,7 @@ class Q_CORE_EXPORT QOperatingSystemVersion : public QOperatingSystemVersionBase { public: // ### Qt7: Remove. Keep synchronized with QOperatingSystemVersionBase::OSType until then! -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) enum OSType { Unknown = 0, Windows, @@ -122,7 +122,7 @@ public: // without breaking our BC promises. They must be fully inline but we cannot make that change // until Qt7 // @note: New entries should be added after the if-def-ery until Qt 7!! -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) static const QOperatingSystemVersion Windows7; static const QOperatingSystemVersion Windows8; static const QOperatingSystemVersion Windows8_1;