From 33cb0f36d1be77091bab6014139dd08c466a63ec Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 15 Jan 2015 15:02:51 +0100 Subject: [PATCH] Debugger: Parse LLDB version number in Debugger settings page This is purely informational, so no need to try overly hard. Change-Id: I76f25d5c9d9b4e65c10bf66ad1d48e08ab65293c Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggeritem.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index cd237bba61a..055c2675dc2 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -142,9 +142,18 @@ void DebuggerItem::reinitializeFromFile() .arg(version / 10000).arg((version / 100) % 100).arg(version % 100); return; } - if (ba.contains("lldb") || ba.startsWith("LLDB")) { + if (ba.startsWith("lldb") || ba.startsWith("LLDB")) { m_engineType = LldbEngineType; m_abis = Abi::abisOfBinary(m_command); + + // Version + if (ba.startsWith(("lldb version "))) { // Linux typically. + int pos1 = strlen("lldb version "); + int pos2 = ba.indexOf(' ', pos1); + m_version = QString::fromLatin1(ba.mid(pos1, pos2 - pos1)); + } else if (ba.startsWith("lldb-") || ba.startsWith("LLDB-")) { // Mac typically. + m_version = QString::fromLatin1(ba.mid(5)); + } return; } if (ba.startsWith("Python")) {