From 7b4b1e2a7270232bde6477c248a27aa3d8dc80ad Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 23 Jul 2024 09:02:52 +0200 Subject: [PATCH] Debugger: Fix debugger type detection of Android NDK LLDBs NDKs usually ship the python libraries required by the NDKs LLDB. However, these libraries reside in a different location. DebuggerItem::addAndroidLldbPythonEnv takes care of finding that location. This change re-adds the recently remopved DebuggerItem::addAndroidLldbPythonEnv call, so that LLDB can again be detected. Amends: b56a447a83abf19126764549c4908b8ffedc0375 Fixes: QTCREATORBUG-31279 Change-Id: I78cb7dfd1abd96f7bc52e4adff9dddd054f8ac0b Reviewed-by: Cristian Adam --- src/plugins/debugger/debuggeritem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 9cd855c148e..120684c9fe4 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -146,6 +146,7 @@ void DebuggerItem::reinitializeFromFile(QString *error, Utils::Environment *cust } Environment env = customEnv ? *customEnv : m_command.deviceEnvironment(); + DebuggerItem::addAndroidLldbPythonEnv(m_command, env); // QNX gdb unconditionally checks whether the QNX_TARGET env variable is // set and bails otherwise, even when it is not used by the specific