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

Debugger: Enable detection of Android Studio's lldb frontend

Browse Source 
Android Studio (at least on Windows) ships an LLDBFrontend(.exe) which
differs in file name and version output, so that the code in
DebuggerItem::reinitializeFromFile needs to be tweakd a bit.

Fixes: QTCREATORBUG-26504
Change-Id: Ic989a6110e03088148c28a7fe6248e5f836ea2ea
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2021-10-29 15:10:03 +02:00
parent 5ba3eb7fcf
commit 5cde121aaa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,8 @@ void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *erro
// except for the experimental LLDB-MI which insists on --version. // except for the experimental LLDB-MI which insists on --version.
QString version = "-version"; QString version = "-version";
m_lastModified = m_command.lastModified(); m_lastModified = m_command.lastModified();
if (m_command.baseName().toLower().contains("lldb-mi")) if (m_command.baseName().toLower().contains("lldb-mi")
|| m_command.baseName().startsWith("LLDBFrontend")) // Comes with Android Studio
version = "--version"; version = "--version";
// We don't need to start the uVision executable to // We don't need to start the uVision executable to
@@ -229,15 +230,16 @@ void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *erro
//! \note If unable to determine the GDB ABI, no ABI is appended to m_abis here. //! \note If unable to determine the GDB ABI, no ABI is appended to m_abis here.
return; return;
} }
if (output.startsWith("lldb") || output.startsWith("LLDB")) { if (output.contains("lldb") || output.startsWith("LLDB")) {
m_engineType = LldbEngineType; m_engineType = LldbEngineType;
m_abis = Abi::abisOfBinary(m_command); m_abis = Abi::abisOfBinary(m_command);
// Version // Version
// Self-build binaries also emit clang and llvm revision. // Self-build binaries also emit clang and llvm revision.
const QString line = output.split('\n')[0]; const QString line = output.split('\n')[0];
if (line.startsWith(("lldb version "))) { // Linux typically. const QString nonMacOSPrefix = "lldb version ";
int pos1 = int(strlen("lldb version ")); if (line.contains(nonMacOSPrefix)) { // Linux typically, or some Windows builds.
int pos1 = line.indexOf(nonMacOSPrefix) + nonMacOSPrefix.length();
int pos2 = line.indexOf(' ', pos1); int pos2 = line.indexOf(' ', pos1);
m_version = line.mid(pos1, pos2 - pos1); m_version = line.mid(pos1, pos2 - pos1);
} else if (line.startsWith("lldb-") || line.startsWith("LLDB-")) { // Mac typically. } else if (line.startsWith("lldb-") || line.startsWith("LLDB-")) { // Mac typically.