From 3726218b5e1311f67f41e56d1355bd35b86d9676 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 1 Apr 2019 14:30:49 +0200 Subject: [PATCH] Debugger: Restrict the file name pattern of potential lldb executables We now try executables such as lldb-7 or lldb-1024, but not e.g. lldb- vscode, which used to time out the autodetection code. Change-Id: Iac3b6c4d55d34ee98073f99c8e8341011845ca92 Reviewed-by: hjk --- src/plugins/debugger/debuggeritemmanager.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 6891d43faf3..0b730cb971f 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -702,7 +702,7 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() { const QStringList filters = {"gdb-i686-pc-mingw32", "gdb-i686-pc-mingw32.exe", "gdb", - "gdb.exe", "lldb", "lldb.exe", "lldb-*"}; + "gdb.exe", "lldb", "lldb.exe", "lldb-[1-9]*"}; // DebuggerItem result; // result.setAutoDetected(true); @@ -748,14 +748,8 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() dir.setFilter(QDir::Files | QDir::Executable); foreach (const Utils::FileName &base, path) { dir.setPath(base.toFileInfo().absoluteFilePath()); - foreach (const QString &entry, dir.entryList()) { - if (entry.startsWith("lldb-platform-") - || entry.startsWith("lldb-gdbserver-") - || entry.startsWith("lldb-mi-")) { - continue; - } + foreach (const QString &entry, dir.entryList()) suspects.append(FileName::fromString(dir.absoluteFilePath(entry))); - } } foreach (const FileName &command, suspects) {