diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 13:41:19 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-22 11:33:02 +0200 |
commit | 59342379bde1be36b5c42cc8019c598138a0b534 (patch) | |
tree | 14b9be0bcb2d227c0c3a7118f6bd4895684ed56d | |
parent | 1c4ae44f6f15bcb40d329668756d9a9456ab9348 (diff) |
QSysInfo: remove deprecated windowsVersion() and macVersion()
Remove their associated enums, too.
All deprecated since 5.9.
Change-Id: Ieefba1a08c221ea7b62500f219baea8a3ccfb7db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r-- | src/corelib/global/qglobal.cpp | 223 | ||||
-rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 4 | ||||
-rw-r--r-- | src/corelib/global/qsysinfo.h | 151 |
3 files changed, 0 insertions, 378 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 2ed15595b7..5724ecd627 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1212,49 +1212,6 @@ bool qSharedBuild() noexcept the application is compiled (32 or 64). */ -#if QT_DEPRECATED_SINCE(5, 9) -/*! - \deprecated - \variable QSysInfo::WindowsVersion - \brief the version of the Windows operating system on which the - application is run. - - Use QOperatingSystemVersion::current() instead. -*/ - -/*! - \deprecated - \fn QSysInfo::WindowsVersion QSysInfo::windowsVersion() - \since 4.4 - - Use QOperatingSystemVersion::current() instead. - - Returns the version of the Windows operating system on which the - application is run, or WV_None if the operating system is not - Windows. -*/ - -/*! - \deprecated - \variable QSysInfo::MacintoshVersion - \brief the version of the Macintosh operating system on which - the application is run. - - Use QOperatingSystemVersion::current() instead. -*/ - -/*! - \deprecated - \fn QSysInfo::MacVersion QSysInfo::macVersion() - - Use QOperatingSystemVersion::current() instead. - - Returns the version of Darwin (\macos or iOS) on which the - application is run, or MV_None if the operating system - is not a version of Darwin. -*/ -#endif - /*! \enum QSysInfo::Endian @@ -1264,144 +1221,6 @@ bool qSharedBuild() noexcept the platform's byte order. */ -#if QT_DEPRECATED_SINCE(5, 9) -/*! - \deprecated - \enum QSysInfo::WinVersion - - Use the versions defined in QOperatingSystemVersion instead. - - This enum provides symbolic names for the various versions of the - Windows operating system. On Windows, the - QSysInfo::WindowsVersion variable gives the version of the system - on which the application is run. - - MS-DOS-based versions: - - \value WV_32s Windows 3.1 with Win 32s - \value WV_95 Windows 95 - \value WV_98 Windows 98 - \value WV_Me Windows Me - - NT-based versions (note that each operating system version is only represented once rather than each Windows edition): - - \value WV_NT Windows NT (operating system version 4.0) - \value WV_2000 Windows 2000 (operating system version 5.0) - \value WV_XP Windows XP (operating system version 5.1) - \value WV_2003 Windows Server 2003, Windows Server 2003 R2, Windows Home Server, Windows XP Professional x64 Edition (operating system version 5.2) - \value WV_VISTA Windows Vista, Windows Server 2008 (operating system version 6.0) - \value WV_WINDOWS7 Windows 7, Windows Server 2008 R2 (operating system version 6.1) - \value WV_WINDOWS8 Windows 8 (operating system version 6.2) - \value WV_WINDOWS8_1 Windows 8.1 (operating system version 6.3), introduced in Qt 5.2 - \value WV_WINDOWS10 Windows 10 (operating system version 10.0), introduced in Qt 5.5 - - Alternatively, you may use the following macros which correspond directly to the Windows operating system version number: - - \value WV_4_0 Operating system version 4.0, corresponds to Windows NT - \value WV_5_0 Operating system version 5.0, corresponds to Windows 2000 - \value WV_5_1 Operating system version 5.1, corresponds to Windows XP - \value WV_5_2 Operating system version 5.2, corresponds to Windows Server 2003, Windows Server 2003 R2, Windows Home Server, and Windows XP Professional x64 Edition - \value WV_6_0 Operating system version 6.0, corresponds to Windows Vista and Windows Server 2008 - \value WV_6_1 Operating system version 6.1, corresponds to Windows 7 and Windows Server 2008 R2 - \value WV_6_2 Operating system version 6.2, corresponds to Windows 8 - \value WV_6_3 Operating system version 6.3, corresponds to Windows 8.1, introduced in Qt 5.2 - \value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 5.5 - - The following masks can be used for testing whether a Windows - version is MS-DOS-based or NT-based: - - \value WV_DOS_based MS-DOS-based version of Windows - \value WV_NT_based NT-based version of Windows - - \value WV_None Operating system other than Windows. - - \omitvalue WV_CE - \omitvalue WV_CENET - \omitvalue WV_CE_5 - \omitvalue WV_CE_6 - \omitvalue WV_CE_based - - \sa MacVersion -*/ - -/*! - \deprecated - \enum QSysInfo::MacVersion - - Use the versions defined in QOperatingSystemVersion instead. - - This enum provides symbolic names for the various versions of the - Darwin operating system, covering both \macos and iOS. The - QSysInfo::MacintoshVersion variable gives the version of the - system on which the application is run. - - \value MV_9 \macos 9 - \value MV_10_0 \macos 10.0 - \value MV_10_1 \macos 10.1 - \value MV_10_2 \macos 10.2 - \value MV_10_3 \macos 10.3 - \value MV_10_4 \macos 10.4 - \value MV_10_5 \macos 10.5 - \value MV_10_6 \macos 10.6 - \value MV_10_7 \macos 10.7 - \value MV_10_8 \macos 10.8 - \value MV_10_9 \macos 10.9 - \value MV_10_10 \macos 10.10 - \value MV_10_11 \macos 10.11 - \value MV_10_12 \macos 10.12 - \value MV_Unknown An unknown and currently unsupported platform - - \value MV_CHEETAH Apple codename for MV_10_0 - \value MV_PUMA Apple codename for MV_10_1 - \value MV_JAGUAR Apple codename for MV_10_2 - \value MV_PANTHER Apple codename for MV_10_3 - \value MV_TIGER Apple codename for MV_10_4 - \value MV_LEOPARD Apple codename for MV_10_5 - \value MV_SNOWLEOPARD Apple codename for MV_10_6 - \value MV_LION Apple codename for MV_10_7 - \value MV_MOUNTAINLION Apple codename for MV_10_8 - \value MV_MAVERICKS Apple codename for MV_10_9 - \value MV_YOSEMITE Apple codename for MV_10_10 - \value MV_ELCAPITAN Apple codename for MV_10_11 - \value MV_SIERRA Apple codename for MV_10_12 - - \value MV_IOS iOS (any) - \value MV_IOS_4_3 iOS 4.3 - \value MV_IOS_5_0 iOS 5.0 - \value MV_IOS_5_1 iOS 5.1 - \value MV_IOS_6_0 iOS 6.0 - \value MV_IOS_6_1 iOS 6.1 - \value MV_IOS_7_0 iOS 7.0 - \value MV_IOS_7_1 iOS 7.1 - \value MV_IOS_8_0 iOS 8.0 - \value MV_IOS_8_1 iOS 8.1 - \value MV_IOS_8_2 iOS 8.2 - \value MV_IOS_8_3 iOS 8.3 - \value MV_IOS_8_4 iOS 8.4 - \value MV_IOS_9_0 iOS 9.0 - \value MV_IOS_9_1 iOS 9.1 - \value MV_IOS_9_2 iOS 9.2 - \value MV_IOS_9_3 iOS 9.3 - \value MV_IOS_10_0 iOS 10.0 - - \value MV_TVOS tvOS (any) - \value MV_TVOS_9_0 tvOS 9.0 - \value MV_TVOS_9_1 tvOS 9.1 - \value MV_TVOS_9_2 tvOS 9.2 - \value MV_TVOS_10_0 tvOS 10.0 - - \value MV_WATCHOS watchOS (any) - \value MV_WATCHOS_2_0 watchOS 2.0 - \value MV_WATCHOS_2_1 watchOS 2.1 - \value MV_WATCHOS_2_2 watchOS 2.2 - \value MV_WATCHOS_3_0 watchOS 3.0 - - \value MV_None Not a Darwin operating system - - \sa WinVersion -*/ -#endif - /*! \macro Q_OS_DARWIN \relates <QtGlobal> @@ -2100,28 +1919,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qnamespace.h" QT_END_INCLUDE_NAMESPACE -#if QT_DEPRECATED_SINCE(5, 9) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -QSysInfo::MacVersion QSysInfo::macVersion() -{ - const auto version = QOperatingSystemVersion::current(); -#if defined(Q_OS_MACOS) - return QSysInfo::MacVersion(Q_MV_OSX(version.majorVersion(), version.minorVersion())); -#elif defined(Q_OS_IOS) - return QSysInfo::MacVersion(Q_MV_IOS(version.majorVersion(), version.minorVersion())); -#elif defined(Q_OS_TVOS) - return QSysInfo::MacVersion(Q_MV_TVOS(version.majorVersion(), version.minorVersion())); -#elif defined(Q_OS_WATCHOS) - return QSysInfo::MacVersion(Q_MV_WATCHOS(version.majorVersion(), version.minorVersion())); -#else - return QSysInfo::MV_Unknown; -#endif -} -const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion(); -QT_WARNING_POP -#endif - #ifdef Q_OS_DARWIN static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSystemVersion::current()) { @@ -2186,26 +1983,6 @@ QWindowsSockInit::~QWindowsSockInit() Q_GLOBAL_STATIC(QWindowsSockInit, winsockInit) # endif // QT_BOOTSTRAPPED -#if QT_DEPRECATED_SINCE(5, 9) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -QSysInfo::WinVersion QSysInfo::windowsVersion() -{ - const auto version = QOperatingSystemVersion::current(); - if (version.majorVersion() == 6 && version.minorVersion() == 1) - return QSysInfo::WV_WINDOWS7; - if (version.majorVersion() == 6 && version.minorVersion() == 2) - return QSysInfo::WV_WINDOWS8; - if (version.majorVersion() == 6 && version.minorVersion() == 3) - return QSysInfo::WV_WINDOWS8_1; - if (version.majorVersion() == 10 && version.minorVersion() == 0) - return QSysInfo::WV_WINDOWS10; - return QSysInfo::WV_NT_based; -} -const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion(); -QT_WARNING_POP -#endif - static QString readVersionRegistryString(const wchar_t *subKey) { #if !defined(QT_BUILD_QMAKE) diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 261f5c8795..cbd9f85264 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -64,10 +64,6 @@ QT_BEGIN_NAMESPACE operating system version (as opposed to the kernel version number or marketing version). - This class is also a complete replacement for QSysInfo::macVersion and - QSysInfo::windowsVersion, additionally providing access to the third (micro) - version number component. - Presently, Android, Apple Platforms (iOS, macOS, tvOS, and watchOS), and Windows are supported. diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index a3fa0fcb27..a6d9104d2d 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -49,23 +49,6 @@ QT_BEGIN_NAMESPACE System information */ -/* - * GCC (5-7) has a regression that causes it to emit wrong deprecated warnings: - * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77849 - * - * Try to work around it by defining our own macro. - */ - -#ifdef QT_SYSINFO_DEPRECATED_X -#error "QT_SYSINFO_DEPRECATED_X already defined" -#endif - -#ifdef Q_CC_GNU -#define QT_SYSINFO_DEPRECATED_X(x) -#else -#define QT_SYSINFO_DEPRECATED_X(x) QT_DEPRECATED_X(x) -#endif - class QString; class Q_CORE_EXPORT QSysInfo { public: @@ -96,138 +79,6 @@ public: # endif }; #endif -#if QT_DEPRECATED_SINCE(5, 9) - enum QT_DEPRECATED_X("Use QOperatingSystemVersion") WinVersion { - WV_None = 0x0000, - - WV_32s = 0x0001, - WV_95 = 0x0002, - WV_98 = 0x0003, - WV_Me = 0x0004, - WV_DOS_based= 0x000f, - - /* codenames */ - WV_NT = 0x0010, - WV_2000 = 0x0020, - WV_XP = 0x0030, - WV_2003 = 0x0040, - WV_VISTA = 0x0080, - WV_WINDOWS7 = 0x0090, - WV_WINDOWS8 = 0x00a0, - WV_WINDOWS8_1 = 0x00b0, - WV_WINDOWS10 = 0x00c0, - WV_NT_based = 0x00f0, - - /* version numbers */ - WV_4_0 = WV_NT, - WV_5_0 = WV_2000, - WV_5_1 = WV_XP, - WV_5_2 = WV_2003, - WV_6_0 = WV_VISTA, - WV_6_1 = WV_WINDOWS7, - WV_6_2 = WV_WINDOWS8, - WV_6_3 = WV_WINDOWS8_1, - WV_10_0 = WV_WINDOWS10, - - WV_CE = 0x0100, - WV_CENET = 0x0200, - WV_CE_5 = 0x0300, - WV_CE_6 = 0x0400, - WV_CE_based = 0x0f00 - }; - -#define Q_MV_OSX(major, minor) (major == 10 ? minor + 2 : (major == 9 ? 1 : 0)) -#define Q_MV_IOS(major, minor) (QSysInfo::MV_IOS | major << 4 | minor) -#define Q_MV_TVOS(major, minor) (QSysInfo::MV_TVOS | major << 4 | minor) -#define Q_MV_WATCHOS(major, minor) (QSysInfo::MV_WATCHOS | major << 4 | minor) - enum QT_DEPRECATED_X("Use QOperatingSystemVersion") MacVersion { - MV_None = 0xffff, - MV_Unknown = 0x0000, - - /* version */ - MV_9 = Q_MV_OSX(9, 0), - MV_10_0 = Q_MV_OSX(10, 0), - MV_10_1 = Q_MV_OSX(10, 1), - MV_10_2 = Q_MV_OSX(10, 2), - MV_10_3 = Q_MV_OSX(10, 3), - MV_10_4 = Q_MV_OSX(10, 4), - MV_10_5 = Q_MV_OSX(10, 5), - MV_10_6 = Q_MV_OSX(10, 6), - MV_10_7 = Q_MV_OSX(10, 7), - MV_10_8 = Q_MV_OSX(10, 8), - MV_10_9 = Q_MV_OSX(10, 9), - MV_10_10 = Q_MV_OSX(10, 10), - MV_10_11 = Q_MV_OSX(10, 11), - MV_10_12 = Q_MV_OSX(10, 12), - - /* codenames */ - MV_CHEETAH = MV_10_0, - MV_PUMA = MV_10_1, - MV_JAGUAR = MV_10_2, - MV_PANTHER = MV_10_3, - MV_TIGER = MV_10_4, - MV_LEOPARD = MV_10_5, - MV_SNOWLEOPARD = MV_10_6, - MV_LION = MV_10_7, - MV_MOUNTAINLION = MV_10_8, - MV_MAVERICKS = MV_10_9, - MV_YOSEMITE = MV_10_10, - MV_ELCAPITAN = MV_10_11, - MV_SIERRA = MV_10_12, - - /* iOS */ - MV_IOS = 1 << 8, - MV_IOS_4_3 = Q_MV_IOS(4, 3), - MV_IOS_5_0 = Q_MV_IOS(5, 0), - MV_IOS_5_1 = Q_MV_IOS(5, 1), - MV_IOS_6_0 = Q_MV_IOS(6, 0), - MV_IOS_6_1 = Q_MV_IOS(6, 1), - MV_IOS_7_0 = Q_MV_IOS(7, 0), - MV_IOS_7_1 = Q_MV_IOS(7, 1), - MV_IOS_8_0 = Q_MV_IOS(8, 0), - MV_IOS_8_1 = Q_MV_IOS(8, 1), - MV_IOS_8_2 = Q_MV_IOS(8, 2), - MV_IOS_8_3 = Q_MV_IOS(8, 3), - MV_IOS_8_4 = Q_MV_IOS(8, 4), - MV_IOS_9_0 = Q_MV_IOS(9, 0), - MV_IOS_9_1 = Q_MV_IOS(9, 1), - MV_IOS_9_2 = Q_MV_IOS(9, 2), - MV_IOS_9_3 = Q_MV_IOS(9, 3), - MV_IOS_10_0 = Q_MV_IOS(10, 0), - - /* tvOS */ - MV_TVOS = 1 << 9, - MV_TVOS_9_0 = Q_MV_TVOS(9, 0), - MV_TVOS_9_1 = Q_MV_TVOS(9, 1), - MV_TVOS_9_2 = Q_MV_TVOS(9, 2), - MV_TVOS_10_0 = Q_MV_TVOS(10, 0), - - /* watchOS */ - MV_WATCHOS = 1 << 10, - MV_WATCHOS_2_0 = Q_MV_WATCHOS(2, 0), - MV_WATCHOS_2_1 = Q_MV_WATCHOS(2, 1), - MV_WATCHOS_2_2 = Q_MV_WATCHOS(2, 2), - MV_WATCHOS_3_0 = Q_MV_WATCHOS(3, 0) - }; - -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const WinVersion WindowsVersion; - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static WinVersion windowsVersion(); -#else - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const WinVersion WindowsVersion = WV_None; - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static WinVersion windowsVersion() { return WV_None; } -#endif -#if defined(Q_OS_MAC) - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const MacVersion MacintoshVersion; - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static MacVersion macVersion(); -#else - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const MacVersion MacintoshVersion = MV_None; - QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static MacVersion macVersion() { return MV_None; } -#endif -QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(5, 9) static QString buildCpuArchitecture(); static QString currentCpuArchitecture(); @@ -244,7 +95,5 @@ QT_WARNING_POP static QByteArray bootUniqueId(); }; -#undef QT_SYSINFO_DEPRECATED_X - QT_END_NAMESPACE #endif // QSYSINFO_H |