QOperatingSystemVersion: Test Qt7 path in bootstrap builds
Just to make sure it is not broken and will not break. Change-Id: I947f8225027d6b6744eb8b774058b7e4d923b61d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
486651db3c
commit
71e1393bb5
@ -359,6 +359,8 @@ bool QOperatingSystemVersionBase::isAnyOfType(std::initializer_list<OSType> 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)
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user