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

Debugger: Avoid warnings about wrong cmd line option to CDB on startup

Browse Source 
Task-number: QTCREATORBUG-14100
Change-Id: I88775b51587120a765cdfcde798b0ac7313ec7ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
hjk
2015-03-05 16:29:29 +01:00
parent 68807bdde1
commit 5558615510
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,9 @@ void DebuggerItem::createId()
void DebuggerItem::reinitializeFromFile() void DebuggerItem::reinitializeFromFile()
{ {
QProcess proc; QProcess proc;
proc.start(m_command.toString(), QStringList() << QLatin1String("--version")); // CDB only understands the single-dash -version, whereas GDB and LLDB are
// happy with both -version and --version. So use the "working" -version.
proc.start(m_command.toString(), QStringList() << QLatin1String("-version"));
if (!proc.waitForStarted() || !proc.waitForFinished()) { if (!proc.waitForStarted() || !proc.waitForFinished()) {
m_engineType = NoEngineType; m_engineType = NoEngineType;
return; return;
@@ -162,23 +164,17 @@ void DebuggerItem::reinitializeFromFile()
} }
return; return;
} }
if (ba.startsWith("cdb")) {
// "cdb version 6.2.9200.16384"
m_engineType = CdbEngineType;
m_abis = Abi::abisOfBinary(m_command);
m_version = QString::fromLatin1(ba).section(QLatin1Char(' '), 2);
return;
}
if (ba.startsWith("Python")) { if (ba.startsWith("Python")) {
m_engineType = PdbEngineType; m_engineType = PdbEngineType;
return; return;
} }
if (ba.isEmpty()) {
proc.start(m_command.toString(), QStringList() << QLatin1String("-version"));
if (!proc.waitForStarted() || !proc.waitForFinished()) {
m_engineType = NoEngineType;
return;
}
ba = proc.readAll();
if (ba.startsWith("cdb")) {
m_engineType = CdbEngineType;
m_abis = Abi::abisOfBinary(m_command);
return;
}
}
m_engineType = NoEngineType; m_engineType = NoEngineType;
} }