feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: ignore windows store redirectors

Browse Source 
Change-Id: Ife5c13549d73156550a7ce4b5436f1e5a19503fa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-06-16 15:09:39 +02:00
parent 498418bbc9
commit 3b8b247f88
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/python/pythonutils.cpp
View File

@@ -74,13 +74,22 @@ FilePath detectPython(const FilePath &documentPath)
if (defaultInterpreter.exists()) if (defaultInterpreter.exists())
return defaultInterpreter; return defaultInterpreter;
const FilePath python3FromPath = env.searchInPath("python3"); auto pythonFromPath = [=](const QString toCheck) {
if (python3FromPath.exists()) for (const FilePath &python : env.findAllInPath(toCheck)) {
return python3FromPath; // Windows creates empty redirector files that may interfere
if (python.exists() && python.osType() == OsTypeWindows && python.fileSize() != 0)
return python;
}
return FilePath();
};
const FilePath pythonFromPath = env.searchInPath("python"); const FilePath fromPath3 = pythonFromPath("python3");
if (pythonFromPath.exists()) if (fromPath3.exists())
return pythonFromPath; return fromPath3;
const FilePath fromPath = pythonFromPath("python");
if (fromPath.exists())
return fromPath;
return PythonSettings::interpreters().value(0).command; return PythonSettings::interpreters().value(0).command;
} }