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

Debugger: Replace guessKitFromParameters()

Browse Source 
... by guessKitFromAbis(), that's what it is.

Change-Id: I45b0f9cc2fb6af5ed0832dab9f798ebe8101cf66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-12 11:19:51 +02:00
parent 50e3085f22
commit 4c360601b4
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1109,17 +1109,11 @@ static QString msgParameterMissing(const QString &a)
return DebuggerPlugin::tr("Option \"%1\" is missing the parameter.").arg(a); return DebuggerPlugin::tr("Option \"%1\" is missing the parameter.").arg(a);
} }
static Kit *guessKitFromParameters(const DebuggerRunParameters &rp) static Kit *guessKitFromAbis(const QList<Abi> &abis)
{ {
Kit *kit = 0; Kit *kit = 0;
// Try to find a kit via ABI. // Try to find a kit via ABI.
QList<Abi> abis;
if (rp.toolChainAbi.isValid())
abis.push_back(rp.toolChainAbi);
else if (!rp.inferior.executable.isEmpty())
abis = Abi::abisOfBinary(FileName::fromString(rp.inferior.executable));
if (!abis.isEmpty()) { if (!abis.isEmpty()) {
// Try exact abis. // Try exact abis.
kit = KitManager::kit([abis](const Kit *k) { kit = KitManager::kit([abis](const Kit *k) {
@@ -1206,7 +1200,8 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
rp.debugger.environment = Utils::Environment::systemEnvironment(); rp.debugger.environment = Utils::Environment::systemEnvironment();
if (!kit) if (!kit)
kit = guessKitFromParameters(rp); kit = guessKitFromAbis(Abi::abisOfBinary(FileName::fromString(rp.inferior.executable)));
auto debugger = DebuggerRunTool::createFromKit(kit); auto debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return false); QTC_ASSERT(debugger, return false);
debugger->setRunParameters(rp); debugger->setRunParameters(rp);
@@ -2151,7 +2146,7 @@ void DebuggerPlugin::attachExternalApplication(RunControl *rc)
if (RunConfiguration *runConfig = rc->runConfiguration()) { if (RunConfiguration *runConfig = rc->runConfiguration()) {
debugger = DebuggerRunTool::createFromRunConfiguration(runConfig); debugger = DebuggerRunTool::createFromRunConfiguration(runConfig);
} else { } else {
Kit *kit = guessKitFromParameters(rp); Kit *kit = guessKitFromAbis({rc->abi()});
debugger = DebuggerRunTool::createFromKit(kit); debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return); QTC_ASSERT(debugger, return);
} }