d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-15 01:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Remove Windows XP remnants

Browse Source
This commit is contained in:
Chocobo1 2019-07-26 23:16:35 +08:00
parent cdb0db02f9
commit 3ab2fe907f
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/private/profile_p.cpp
View File

@ -84,11 +84,6 @@ QString Private::DefaultProfile::dataLocation() const
QString Private::DefaultProfile::downloadLocation() const QString Private::DefaultProfile::downloadLocation() const
{ {
#if defined(Q_OS_WIN)
if (QSysInfo::windowsVersion() <= QSysInfo::WV_XP) // Windows XP
return QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).absoluteFilePath(
QCoreApplication::translate("fsutils", "Downloads"));
#endif
return QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); return QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
} }

20
src/gui/mainwindow.cpp
View File

@ -28,11 +28,6 @@
#include "mainwindow.h" #include "mainwindow.h"
#if defined(Q_OS_WIN)
#include <Windows.h>
#include <versionhelpers.h> // must follow after Windows.h
#endif
#include <QCloseEvent> #include <QCloseEvent>
#include <QDebug> #include <QDebug>
#include <QDesktopServices> #include <QDesktopServices>
@ -2007,9 +2002,7 @@ void MainWindow::installPython()
{ {
setCursor(QCursor(Qt::WaitCursor)); setCursor(QCursor(Qt::WaitCursor));
// Download python // Download python
const QString installerURL = (::IsWindowsVistaOrGreater() const QString installerURL = "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe";
? "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe"
: "https://www.python.org/ftp/python/3.4.4/python-3.4.4.msi");
Net::DownloadManager::instance()->download( Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true) Net::DownloadRequest(installerURL).saveToFile(true)
, this, &MainWindow::pythonDownloadFinished); , this, &MainWindow::pythonDownloadFinished);
@ -2030,14 +2023,8 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result)
QProcess installer; QProcess installer;
qDebug("Launching Python installer in passive mode..."); qDebug("Launching Python installer in passive mode...");
if (::IsWindowsVistaOrGreater()) {
QFile::rename(result.filePath, result.filePath + ".exe"); QFile::rename(result.filePath, result.filePath + ".exe");
installer.start('"' + Utils::Fs::toNativePath(result.filePath) + ".exe\" /passive"); installer.start('"' + Utils::Fs::toNativePath(result.filePath) + ".exe\" /passive");
}
else {
QFile::rename(result.filePath, result.filePath + ".msi");
installer.start(Utils::Misc::windowsSystemPath() + "\\msiexec.exe /passive /i \"" + Utils::Fs::toNativePath(result.filePath) + ".msi\"");
}
// Wait for setup to complete // Wait for setup to complete
installer.waitForFinished(10 * 60 * 1000); installer.waitForFinished(10 * 60 * 1000);
@ -2045,11 +2032,10 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result)
qDebug("Installer stdout: %s", installer.readAllStandardOutput().data()); qDebug("Installer stdout: %s", installer.readAllStandardOutput().data());
qDebug("Installer stderr: %s", installer.readAllStandardError().data()); qDebug("Installer stderr: %s", installer.readAllStandardError().data());
qDebug("Setup should be complete!"); qDebug("Setup should be complete!");
// Delete temp file // Delete temp file
if (::IsWindowsVistaOrGreater())
Utils::Fs::forceRemove(result.filePath + ".exe"); Utils::Fs::forceRemove(result.filePath + ".exe");
else
Utils::Fs::forceRemove(result.filePath + ".msi");
// Reload search engine // Reload search engine
if (Utils::ForeignApps::pythonInfo().isSupportedVersion()) { if (Utils::ForeignApps::pythonInfo().isSupportedVersion()) {
m_ui->actionSearchWidget->setChecked(true); m_ui->actionSearchWidget->setChecked(true);