diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:14:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:51:15 +0100 |
| commit | c53ccceff1e1642b7704fa8b0681604c25a833a0 (patch) | |
| tree | 7258d63fba4dabd6f9e2f2f36089ce45df7fe3af /src/plugins/debugger/debuggeritemmanager.cpp | |
| parent | 62cafc1782369cde0605fbd6b1182a83d5473a12 (diff) | |
| parent | 429eb73ace5909e228a58bf8b067823e2be44212 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/debuggerkitinformation.cpp
src/plugins/languageclient/languageclientmanager.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/kit.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
Diffstat (limited to 'src/plugins/debugger/debuggeritemmanager.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggeritemmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index adc81bee691..4a7fb5d4a30 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -748,7 +748,8 @@ void DebuggerItemManagerPrivate::autoDetectGdbOrLldbDebuggers() dir.setPath(base.toFileInfo().absoluteFilePath()); foreach (const QString &entry, dir.entryList()) { if (entry.startsWith("lldb-platform-") - || entry.startsWith("lldb-gdbserver-")) { + || entry.startsWith("lldb-gdbserver-") + || entry.startsWith("lldb-mi-")) { continue; } suspects.append(FileName::fromString(dir.absoluteFilePath(entry))); |