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

Add Autodetection for system cdb/gdb for kits added by sdktool.

Browse Source 
Introduced special 'auto' value for debugger binary.

Change-Id: I5be4fa148ce9ded06826a7dda647c5ba402dc70a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Friedemann Kleint
2012-09-28 10:13:56 +02:00
parent e834d75b04
commit 23c3f61d1a
4 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -296,8 +296,27 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const
}
QTC_ASSERT(v.type() == QVariant::Map, return result);
const QVariantMap vmap = v.toMap();
result.binary = Utils::FileName::fromString(vmap.value(QLatin1String(binaryKeyC)).toString());
result.engineType = static_cast<DebuggerEngineType>(vmap.value(QLatin1String(engineTypeKeyC)).toInt());
QString binary = vmap.value(QLatin1String(binaryKeyC)).toString();
// Check for special 'auto' entry for binary written by the sdktool during
// installation. Try to autodetect.
if (binary == QLatin1String("auto")) {
binary.clear();
switch (result.engineType) {
case Debugger::GdbEngineType: // Auto-detect system gdb on Unix
if (Abi::hostAbi().os() != Abi::WindowsOS)
binary = Environment::systemEnvironment().searchInPath(QLatin1String("gdb"));
break;
case Debugger::CdbEngineType: { // Auto-detect system CDB on Windows.
const QPair<QString, QString> cdbs = autoDetectCdbDebugger();
binary = cdbs.second.isEmpty() ? cdbs.first : cdbs.second;
}
break;
default:
break;
}
}
result.binary = Utils::FileName::fromString(binary);
return result;
}