Browse Source

Drop support for Windows < 10

adaptive-webui-19844
Chocobo1 1 year ago
parent
commit
9b924c1931
  1. 4
      src/gui/mainwindow.cpp
  2. 14
      src/gui/programupdater.cpp

4
src/gui/mainwindow.cpp

@ -1914,9 +1914,7 @@ void MainWindow::installPython() @@ -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

14
src/gui/programupdater.cpp

@ -30,21 +30,11 @@ @@ -30,21 +30,11 @@
#include "programupdater.h"
#include <QtSystemDetection>
#if defined(Q_OS_WIN)
#include <windows.h>
#include <versionhelpers.h> // must follow after windows.h
#endif
#include <QDebug>
#include <QDesktopServices>
#include <QRegularExpression>
#include <QXmlStreamReader>
#if defined(Q_OS_WIN)
#include <QSysInfo>
#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) @@ -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;

Loading…
Cancel
Save