Merge pull request #9280 from Chocobo1/upgrade

Make ProgramUpdater upgrade to 64-bit qbt when running on 64-bit Windows
This commit is contained in:
Mike Tzou 2018-08-08 01:12:25 +08:00 committed by GitHub
commit 879ba230af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,7 @@
#include <QDesktopServices>
#include <QRegularExpression>
#include <QStringList>
#include <QSysInfo>
#include <QXmlStreamReader>
#include "base/net/downloadhandler.h"
@ -42,14 +43,6 @@ namespace
{
const QString RSS_URL {QStringLiteral("https://www.fosshub.com/software/feedqBittorent")};
#ifdef Q_OS_MAC
const QString OS_TYPE {QStringLiteral("Mac OS X")};
#elif defined(Q_OS_WIN) && (defined(__x86_64__) || defined(_M_X64))
const QString OS_TYPE {QStringLiteral("Windows x64")};
#else
const QString OS_TYPE {QStringLiteral("Windows")};
#endif
QString getStringValue(QXmlStreamReader &xml);
}
@ -73,10 +66,17 @@ void ProgramUpdater::checkForUpdates()
void ProgramUpdater::rssDownloadFinished(const QString &url, const QByteArray &data)
{
Q_UNUSED(url);
qDebug("Finished downloading the new qBittorrent updates RSS");
QString version;
#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)
&& QSysInfo::currentCpuArchitecture().endsWith("64"))
? "Windows x64" : "Windows"};
#endif
QString version;
QXmlStreamReader xml(data);
bool inItem = false;
QString updateLink;