Browse Source

Bump python version minimum requirement

PR #18996.
adaptive-webui-19844
Chocobo1 1 year ago committed by GitHub
parent
commit
b406d669b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      INSTALL
  2. 2
      src/base/utils/foreignapps.cpp
  3. 15
      src/gui/mainwindow.cpp
  4. 2
      src/gui/programupdater.cpp

2
INSTALL

@ -18,7 +18,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
- pkg-config * - pkg-config *
* Compile-time only on *nix systems * Compile-time only on *nix systems
- Python >= 3.5.0 - Python >= 3.7.0
* Optional, run-time only * Optional, run-time only
* Used by the bundled search engine * Used by the bundled search engine

2
src/base/utils/foreignapps.cpp

@ -248,7 +248,7 @@ bool Utils::ForeignApps::PythonInfo::isValid() const
bool Utils::ForeignApps::PythonInfo::isSupportedVersion() const bool Utils::ForeignApps::PythonInfo::isSupportedVersion() const
{ {
return (version >= Version {3, 5, 0}); return (version >= Version {3, 7, 0});
} }
PythonInfo Utils::ForeignApps::pythonInfo() PythonInfo Utils::ForeignApps::pythonInfo()

15
src/gui/mainwindow.cpp

@ -29,9 +29,16 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <QtGlobal>
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
#if defined(Q_OS_WIN)
#include <Windows.h>
#include <versionhelpers.h> // must follow after Windows.h
#endif
#include <QActionGroup> #include <QActionGroup>
#include <QClipboard> #include <QClipboard>
#include <QCloseEvent> #include <QCloseEvent>
@ -1962,9 +1969,13 @@ void MainWindow::installPython()
setCursor(QCursor(Qt::WaitCursor)); setCursor(QCursor(Qt::WaitCursor));
// Download python // Download python
#ifdef QBT_APP_64BIT #ifdef QBT_APP_64BIT
const auto installerURL = u"https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"_qs; const auto installerURL = ::IsWindows8OrGreater()
? u"https://www.python.org/ftp/python/3.10.11/python-3.10.11-amd64.exe"_qs
: u"https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe"_qs;
#else #else
const auto installerURL = u"https://www.python.org/ftp/python/3.8.10/python-3.8.10.exe"_qs; const auto installerURL = ::IsWindows8OrGreater()
? u"https://www.python.org/ftp/python/3.10.11/python-3.10.11.exe"_qs
: u"https://www.python.org/ftp/python/3.8.10/python-3.8.10.exe"_qs;
#endif #endif
Net::DownloadManager::instance()->download( Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true) Net::DownloadRequest(installerURL).saveToFile(true)

2
src/gui/programupdater.cpp

@ -29,6 +29,8 @@
#include "programupdater.h" #include "programupdater.h"
#include <QtGlobal>
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#include <Windows.h> #include <Windows.h>
#include <versionhelpers.h> // must follow after Windows.h #include <versionhelpers.h> // must follow after Windows.h

Loading…
Cancel
Save