1
0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-10 04:11:16 +00:00

Fixup previous commits on python search.

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

View File

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

View File

@ -233,7 +233,7 @@ int Utils::Misc::pythonVersion()
static int version = -1;
if (version < 0) {
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
* http://legacy.python.org/dev/peps/pep-0394/
@ -272,7 +272,7 @@ int Utils::Misc::pythonVersion()
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
* http://legacy.python.org/dev/peps/pep-0394/