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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
This commit is contained in:
Eike Ziller
2019-04-02 12:22:48 +02:00
parent 841bbfa7bf 3726218b5e
commit b5e7522237
170 changed files with 3484 additions and 1979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -700,7 +700,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);
@@ -746,14 +746,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) {