Browse Source

Merge pull request #13268 from ngosang/feature/python35-

Update minimum Python version to 3.5.0
adaptive-webui-19844
Mike Tzou 4 years ago committed by GitHub
parent
commit
49e55d5a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      INSTALL
  2. 2
      src/base/utils/foreignapps.cpp
  3. 6
      src/gui/mainwindow.cpp

2
INSTALL

@ -17,7 +17,7 @@ qBittorrent - A BitTorrent client in C++ / Qt @@ -17,7 +17,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
- pkg-config (compile-time only)
- Python >= 3.3.0 (optional, runtime only)
- Python >= 3.5.0 (optional, runtime only)
* Required by the internal search engine
2a) Compile and install qBittorrent with Qt graphical interface

2
src/base/utils/foreignapps.cpp

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

6
src/gui/mainwindow.cpp

@ -1791,7 +1791,7 @@ void MainWindow::on_actionSearchWidget_triggered() @@ -1791,7 +1791,7 @@ void MainWindow::on_actionSearchWidget_triggered()
#ifdef Q_OS_WIN
const QMessageBox::StandardButton buttonPressed = QMessageBox::question(this, tr("Old Python Runtime")
, tr("Your Python version (%1) is outdated. Minimum requirement: 3.3.0.\nDo you want to install a newer version now?")
, tr("Your Python version (%1) is outdated. Minimum requirement: 3.5.0.\nDo you want to install a newer version now?")
.arg(pyInfo.version)
, (QMessageBox::Yes | QMessageBox::No), QMessageBox::Yes);
if (buttonPressed == QMessageBox::Yes)
@ -2029,9 +2029,9 @@ void MainWindow::installPython() @@ -2029,9 +2029,9 @@ void MainWindow::installPython()
setCursor(QCursor(Qt::WaitCursor));
// Download python
#ifdef QBT_APP_64BIT
const QString installerURL = "https://www.python.org/ftp/python/3.8.1/python-3.8.1-amd64.exe";
const QString installerURL = "https://www.python.org/ftp/python/3.8.5/python-3.8.5-amd64.exe";
#else
const QString installerURL = "https://www.python.org/ftp/python/3.8.1/python-3.8.1.exe";
const QString installerURL = "https://www.python.org/ftp/python/3.8.5/python-3.8.5.exe";
#endif
Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true)

Loading…
Cancel
Save