Replace obsoleted QSysInfo functions

This commit is contained in:
Chocobo1 2019-07-26 01:21:53 +08:00
parent 25c56d3b66
commit cdb0db02f9
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 18 additions and 6 deletions

View file

@ -28,13 +28,21 @@
#include "programupdater.h"
#if defined(Q_OS_WIN)
#include <Windows.h>
#include <versionhelpers.h> // must follow after Windows.h
#endif
#include <QDebug>
#include <QDesktopServices>
#include <QRegularExpression>
#include <QStringList>
#include <QSysInfo>
#include <QXmlStreamReader>
#if defined(Q_OS_WIN)
#include <QSysInfo>
#endif
#include "base/net/downloadmanager.h"
namespace
@ -73,7 +81,7 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result)
#ifdef Q_OS_MAC
const QString OS_TYPE {"Mac OS X"};
#elif defined(Q_OS_WIN)
const QString OS_TYPE {((QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7)
const QString OS_TYPE {(::IsWindows7OrGreater()
&& QSysInfo::currentCpuArchitecture().endsWith("64"))
? "Windows x64" : "Windows"};
#endif