github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-11 15:56:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixup previous commits on python search.

Browse source
This commit is contained in:
sledgehammer999 2015-07-20 23:18:20 +03:00
parent d6af4683bb
commit 8b99e29dc0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/preferences.cpp
View file

@ -1765,8 +1765,8 @@ QString Preferences::getPythonPath()
// Fallback: Detect python from default locations // Fallback: Detect python from default locations
const QStringList dirs = QDir("C:/").entryList(QStringList("Python*"), QDir::Dirs, QDir::Name | QDir::Reversed); const QStringList dirs = QDir("C:/").entryList(QStringList("Python*"), QDir::Dirs, QDir::Name | QDir::Reversed);
foreach (const QString &dir, dirs) { foreach (const QString &dir, dirs) {
const QString path("C:/" + dir + "/python.exe"); const QString path("C:/" + dir + "/");
if (QFile::exists(path)) if (QFile::exists(path + "python.exe"))
return path; return path;
} }

4
src/core/utils/misc.cpp
View file

@ -233,7 +233,7 @@ int Utils::Misc::pythonVersion()
static int version = -1; static int version = -1;
if (version < 0) { if (version < 0) {
QProcess python_proc; QProcess python_proc;
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX)
/* /*
* On Unix-Like Systems python2 and python3 should always exist * On Unix-Like Systems python2 and python3 should always exist
* http://legacy.python.org/dev/peps/pep-0394/ * http://legacy.python.org/dev/peps/pep-0394/
@ -272,7 +272,7 @@ int Utils::Misc::pythonVersion()
QString Utils::Misc::pythonExecutable() QString Utils::Misc::pythonExecutable()
{ {
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX)
/* /*
* On Unix-Like Systems python2 and python3 should always exist * On Unix-Like Systems python2 and python3 should always exist
* http://legacy.python.org/dev/peps/pep-0394/ * http://legacy.python.org/dev/peps/pep-0394/