소스 검색

Use QOperatingSystemVersion::current() instead of QSysInfo.

QOperatingSystemVersion is introduced since QT 5.9.
Yuxin Wang 3 년 전
부모
커밋
663a53a4f7
2개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 3
      src/player/CodecsComponent.cpp
  2. 3 1
      src/power/PowerComponentWin.cpp

+ 4 - 3
src/player/CodecsComponent.cpp

@@ -13,7 +13,7 @@
 #include <QResource>
 #include <QSaveFile>
 #include <QStandardPaths>
-#include <QSysInfo>
+#include <QOperatingSystemVersion>
 #include <QCryptographicHash>
 #include <QTemporaryDir>
 
@@ -483,11 +483,12 @@ static void probeCodecs()
 #endif
 
 #ifdef Q_OS_MAC
+  auto current = QOperatingSystemVersion::current();
   // Unsupported, but avoid picking up broken Perian decoders.
-  if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_10)
+  if (current <= QOperatingSystemVersion::OSXYosemite)
     g_systemAudioDecoderWhitelist.remove("ac3_at");
   // Unknown Apple crashes
-  if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_11)
+  if (current <= QOperatingSystemVersion::OSXElCapitan)
     g_systemAudioDecoderWhitelist.remove("aac_at");
 #endif
 }

+ 3 - 1
src/power/PowerComponentWin.cpp

@@ -1,3 +1,5 @@
+#include <QOperatingSystemVersion>
+
 #include <windows.h>
 
 #include "PowerComponentWin.h"
@@ -40,7 +42,7 @@ bool PowerComponentWin::PowerOff()
 {
   DWORD shutdownFlags = SHUTDOWN_INSTALL_UPDATES | SHUTDOWN_POWEROFF;
 
-  if (QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS8)
+  if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8)
     shutdownFlags |= SHUTDOWN_HYBRID;
 
   return InitiateShutdownW(NULL, NULL, 0, shutdownFlags,