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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
This commit is contained in:
Eike Ziller
2022-06-28 11:35:16 +02:00
parent 9e363c6421 ebf57d37b9
commit f95a1eca34
134 changed files with 595 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/python/pythonlanguageclient.cpp
View File

@@ -153,14 +153,22 @@ class PyLSInterface : public StdIOClientInterface
public:
PyLSInterface()
: m_extraPythonPath("QtCreator-pyls-XXXXXX")
{
Environment env = Environment::systemEnvironment();
env.appendOrSet("PYTHONPATH",
m_extraPythonPath.path().toString(),
OsSpecificAspects::pathListSeparator(env.osType()));
setEnvironment(env);
}
{ }
TemporaryDirectory m_extraPythonPath;
protected:
void startImpl() override
{
if (!m_cmd.executable().needsDevice()) {
// todo check where to put this tempdir in remote setups
Environment env = Environment::systemEnvironment();
env.appendOrSet("PYTHONPATH",
m_extraPythonPath.path().toString(),
OsSpecificAspects::pathListSeparator(env.osType()));
setEnvironment(env);
}
StdIOClientInterface::startImpl();
}
};
PyLSClient *clientForPython(const FilePath &python)