From 8a48d66da999d99dac4e9217542c5f954450ddb4 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Sun, 18 Sep 2016 09:23:31 -0700
Subject: Deprecate QSysInfo::MacVersion, QSysInfo::WindowsVersion, etc

QSysInfo::WinVersion, QSysInfo::WindowsVersion,
QSysInfo::windowsVersion(), QSysInfo::MacVersion,
QSysInfo::MacintoshVersion, and QSysInfo::macVersion() are now
deprecated.

QOperatingSystemVersion exists as a more flexible replacement.

Change-Id: Ib97d1bfb260f2595ba3c06ff8fd251c5de41cedc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/manual/qsysinfo/main.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tests/manual')

diff --git a/tests/manual/qsysinfo/main.cpp b/tests/manual/qsysinfo/main.cpp
index 5add1e4f74..5b391e5dfd 100644
--- a/tests/manual/qsysinfo/main.cpp
+++ b/tests/manual/qsysinfo/main.cpp
@@ -27,11 +27,12 @@
 ****************************************************************************/
 
 #include <QCoreApplication>
+#include <QOperatingSystemVersion>
 #include <QSysInfo>
 
 #include <stdio.h>
 
-// I'm lazy
+#if QT_DEPRECATED_SINCE(5, 9)
 #define CASE_VERSION(v)     case QSysInfo::v:   return QT_STRINGIFY(v)
 
 QByteArray windowsVersionToString(QSysInfo::WinVersion v)
@@ -108,6 +109,7 @@ QByteArray macVersionToString(QSysInfo::MacVersion v)
     }
     return "MacVersion(Q_MV_OSX(10, " + QByteArray::number(v - 2) + "))";
 }
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -116,10 +118,12 @@ int main(int argc, char *argv[])
     printf("QSysInfo::WordSize = %d\n", QSysInfo::WordSize);
     printf("QSysInfo::ByteOrder = QSysInfo::%sEndian\n",
            QSysInfo::ByteOrder == QSysInfo::LittleEndian ? "Little" : "Big");
+#if QT_DEPRECATED_SINCE(5, 9)
     printf("QSysInfo::WindowsVersion = QSysInfo::%s\n",
            windowsVersionToString(QSysInfo::WindowsVersion).constData());
     printf("QSysInfo::MacintoshVersion = QSysInfo::%s\n",
            macVersionToString(QSysInfo::MacintoshVersion).constData());
+#endif
     printf("QSysInfo::buildCpuArchitecture() = %s\n", qPrintable(QSysInfo::buildCpuArchitecture()));
     printf("QSysInfo::currentCpuArchitecture() = %s\n", qPrintable(QSysInfo::currentCpuArchitecture()));
     printf("QSysInfo::buildAbi() = %s\n", qPrintable(QSysInfo::buildAbi()));
@@ -130,5 +134,12 @@ int main(int argc, char *argv[])
     printf("QSysInfo::prettyProductName() = %s\n", qPrintable(QSysInfo::prettyProductName()));
     printf("QSysInfo::machineHostName() = %s\n", qPrintable(QSysInfo::machineHostName()));
 
+    const auto osv = QOperatingSystemVersion::current();
+    printf("QOperatingSystemVersion::current() = %s %d.%d.%d\n",
+        qPrintable(osv.name()),
+        osv.majorVersion(),
+        osv.minorVersion(),
+        osv.microVersion());
+
     return 0;
 }
-- 
cgit v1.2.3