Merge remote-tracking branch 'origin/8.0'

Change-Id: I1dc664137eeecb7dd69f29af7a08164683d51077
2022-08-03 17:51:42 +02:00
parent a714ddf59f f8c3d860fc
commit 7950a038b4
13 changed files with 129 additions and 12 deletions
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -928,7 +928,7 @@ QList<Interpreter> PythonSettings::detectPythonVenvs(const FilePath &path)
                    dir.cdUp();
                }
            }
-        } while (dir.cdUp());
+        } while (dir.cdUp() && !(dir.isRoot() && Utils::HostOsInfo::isAnyUnixHost()));
    }
    return result;
 }