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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
This commit is contained in:
Eike Ziller
2022-04-20 16:12:41 +02:00
parent 80d4c54d2a d0a192064e
commit 3b2134711b
99 changed files with 1785 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/debuggeritem.cpp
View File

@@ -290,6 +290,13 @@ bool DebuggerItem::addAndroidLldbPythonEnv(const Utils::FilePath &lldbCmd, Utils
if (pythonBinDir.exists()) {
env.set("PYTHONHOME", pythonDir.toUserOutput());
env.prependOrSetPath(pythonBinDir);
if (HostOsInfo::isAnyUnixHost()) {
const FilePath pythonLibDir = pythonDir.pathAppended("lib");
if (pythonLibDir.exists())
env.prependOrSet("LD_LIBRARY_PATH", pythonLibDir.toString());
}
return true;
}
}