Commit 5bfb5d9c authored by Tobias Hunger's avatar Tobias Hunger
Browse files

CERC: Use invalid ABI

Use a invalid ABI since we have no idea what we will end up running.
Make the debugger figure out specifics when needed.

Change-Id: Ia74080887617a097a16d789dfd7f88458409a23c
Reviewed-on: http://codereview.qt-project.org/6065

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 41e01f17
......@@ -726,6 +726,11 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
sp.executable = rc->executable();
sp.processArgs = rc->commandLineArguments();
sp.toolChainAbi = rc->abi();
if (!sp.toolChainAbi.isValid()) {
QList<Abi> abis = Abi::abisOfBinary(sp.executable);
if (!abis.isEmpty())
sp.toolChainAbi = abis.at(0);
}
sp.useTerminal = rc->runMode() == LocalApplicationRunConfiguration::Console;
sp.dumperLibrary = rc->dumperLibrary();
sp.dumperLibraryLocations = rc->dumperLibraryLocations();
......
......@@ -337,7 +337,7 @@ QStringList CustomExecutableRunConfiguration::dumperLibraryLocations() const
ProjectExplorer::Abi CustomExecutableRunConfiguration::abi() const
{
return ProjectExplorer::Abi::hostAbi();
return Abi(); // return an invalid ABI: We do not know what we will end up running!
}
// Factory
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment