From 9b924c19319541f92bd2b2e8874a03a73d8e5d41 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 28 Oct 2023 13:33:55 +0800 Subject: [PATCH] Drop support for Windows < 10 --- src/gui/mainwindow.cpp | 4 +--- src/gui/programupdater.cpp | 14 +------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 0df257f3b..1e9dbcd8e 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1914,9 +1914,7 @@ void MainWindow::installPython() setCursor(QCursor(Qt::WaitCursor)); // Download python #ifdef QBT_APP_64BIT - const auto installerURL = ::IsWindows8OrGreater() - ? u"https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"_s - : u"https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"_s; + const auto installerURL = u"https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"_s; #else const auto installerURL = ::IsWindows8OrGreater() ? u"https://www.python.org/ftp/python/3.10.11/python-3.10.11.exe"_s diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp index eab1e020a..ead2e9e49 100644 --- a/src/gui/programupdater.cpp +++ b/src/gui/programupdater.cpp @@ -30,21 +30,11 @@ #include "programupdater.h" #include - -#if defined(Q_OS_WIN) -#include -#include // must follow after windows.h -#endif - #include #include #include #include -#if defined(Q_OS_WIN) -#include -#endif - #include "base/global.h" #include "base/net/downloadmanager.h" #include "base/preferences.h" @@ -110,9 +100,7 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result) #ifdef Q_OS_MACOS const QString OS_TYPE = u"Mac OS X"_s; #elif defined(Q_OS_WIN) - const QString OS_TYPE = (::IsWindows7OrGreater() && QSysInfo::currentCpuArchitecture().endsWith(u"64")) - ? u"Windows x64"_s - : u"Windows"_s; + const QString OS_TYPE = u"Windows x64"_s; #endif bool inItem = false;