From 3d8a4cdca5273b42161caba4cbe1a9f038f06cb2 Mon Sep 17 00:00:00 2001
From: John Regan <john@jrjrtech.com>
Date: Tue, 20 Jul 2021 13:01:43 -0400
Subject: [PATCH] fix deprecation: QSysInfo::MV_10_8 obsolete

---
 gui/interfacesettings.cpp | 4 ++--
 mac/macnotify.mm          | 8 ++++----
 support/configdialog.cpp  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gui/interfacesettings.cpp b/gui/interfacesettings.cpp
index 5506c5405..42cdad2f7 100644
--- a/gui/interfacesettings.cpp
+++ b/gui/interfacesettings.cpp
@@ -41,7 +41,7 @@
 #include <QDBusConnectionInterface>
 #endif
 #include <QSystemTrayIcon>
-#include <QSysInfo>
+#include <QOperatingSystemVersion>
 #include <QStyleFactory>
 #include <algorithm>
 
@@ -132,7 +132,7 @@ InterfaceSettings::InterfaceSettings(QWidget *p)
     bool enableTrayItem=Utils::useSystemTray();
     #ifdef Q_OS_MAC
     // OSX always displays an entry in the taskbar - and the tray seems to confuse things.
-    bool enableNotifications=QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8;
+    bool enableNotifications=QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8);
     #else
     #ifdef QT_QTDBUS_FOUND
     // We have dbus, check that org.freedesktop.Notifications exists
diff --git a/mac/macnotify.mm b/mac/macnotify.mm
index 8c0420f12..5b94dc5c5 100644
--- a/mac/macnotify.mm
+++ b/mac/macnotify.mm
@@ -24,7 +24,7 @@
 #include "macnotify.h"
 #include "config.h"
 #include <QString>
-#include <QSysInfo>
+#include <QOperatingSystemVersion>
 #ifdef QT_MAC_EXTRAS_FOUND
 #include <qmacfunctions.h>
 #include <QImage>
@@ -50,12 +50,12 @@ class UserNotificationItemClass
 public:
     UserNotificationItemClass() {
         item = [UserNotificationItem alloc];
-        if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
+        if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
             [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:item];
         }
     }
     ~UserNotificationItemClass() {
-        if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
+        if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
             [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:nil];
         }
         [item release];
@@ -65,7 +65,7 @@ public:
 
 void MacNotify::showMessage(const QString &title, const QString &text, const QImage &img)
 {
-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
+    if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
         static UserNotificationItemClass *n=0;
         if (!n) {
             n=new UserNotificationItemClass();
diff --git a/support/configdialog.cpp b/support/configdialog.cpp
index b07b13e80..7e18ee745 100644
--- a/support/configdialog.cpp
+++ b/support/configdialog.cpp
@@ -46,7 +46,7 @@
 #include <QAbstractItemView>
 #include <QTimer>
 #include <QPropertyAnimation>
-#include <QSysInfo>
+#include <QOperatingSystemVersion>
 #include <QDesktopWidget>
 #include "icon.h"
 #include "osxstyle.h"
@@ -91,7 +91,7 @@ public:
             QColor col(Qt::black);
             QRect r(rect());
 
-            if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_9) {
+            if (QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 9)) {
                 col.setAlphaF(0.1);
                 p.setClipRect(r);
                 p.setRenderHint(QPainter::Antialiasing, true);