From f5e12237a2ad17665749f10bebb83c3852b539ce Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 2 Nov 2023 10:15:06 +0100 Subject: [PATCH] Python: avoid detecting pythonw on windows Change-Id: I75fcba53fa671904405d3411409c6ea67335e81b Reviewed-by: Christian Stenger --- src/plugins/python/pythonsettings.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp index 4e68f542519..256919b0317 100644 --- a/src/plugins/python/pythonsettings.cpp +++ b/src/plugins/python/pythonsettings.cpp @@ -661,25 +661,12 @@ static QList pythonsFromRegistry() FilePath::fromUserInput(regVal.toString())}; } } - regVal = pythonRegistry.value("InstallPath/WindowedExecutablePath"); - if (regVal.isValid()) { - const FilePath &executable = FilePath::fromUserInput(regVal.toString()); - if (executable.exists()) { - pythons << Interpreter{QUuid::createUuid().toString(), - //: (Windowed) - Tr::tr("%1 (Windowed)").arg(name), - FilePath::fromUserInput(regVal.toString())}; - } - } regVal = pythonRegistry.value("InstallPath/."); if (regVal.isValid()) { const FilePath &path = FilePath::fromUserInput(regVal.toString()); const FilePath python = path.pathAppended("python").withExecutableSuffix(); if (python.exists()) pythons << createInterpreter(python, "Python " + versionGroup); - const FilePath pythonw = path.pathAppended("pythonw").withExecutableSuffix(); - if (pythonw.exists()) - pythons << createInterpreter(pythonw, "Python " + versionGroup, "(Windowed)"); } pythonRegistry.endGroup(); } @@ -697,10 +684,6 @@ static QList pythonsFromPath() if (executable.exists()) pythons << createInterpreter(executable, "Python from Path"); } - for (const FilePath &executable : FilePath("pythonw").searchAllInPath()) { - if (executable.exists()) - pythons << createInterpreter(executable, "Python from Path", "(Windowed)"); - } } else { const QStringList filters = {"python", "python[1-9].[0-9]",