Commit a364b935 authored by hjk's avatar hjk
Browse files

debugger: allow state transition EngineShutdownRequested -> EngineShutdownFailed

parent dfe15b53
......@@ -1104,7 +1104,7 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to)
return to == EngineShutdownRequested;
case EngineShutdownRequested:
return to == EngineShutdownOk;
return to == EngineShutdownOk || to == EngineShutdownFailed;
case EngineShutdownOk:
return to == DebuggerFinished;
case EngineShutdownFailed:
......
......@@ -169,17 +169,20 @@ void RemoteGdbServerAdapter::setupInferior()
QFileInfo fi(startParameters().executable);
fileName = fi.absoluteFilePath();
}
m_engine->postCommand("set architecture "
+ startParameters().remoteArchitecture.toLatin1());
m_engine->postCommand("set sysroot "
+ startParameters().sysRoot.toLocal8Bit());
m_engine->postCommand("set solib-search-path "
+ QFileInfo(startParameters().dumperLibrary).path().toLocal8Bit());
if (!startParameters().processArgs.isEmpty()) {
QString args = startParameters().processArgs.join(_(" "));
const QByteArray sysRoot = startParameters().sysRoot.toLocal8Bit();
const QByteArray remoteArch = startParameters().remoteArchitecture.toLatin1();
const QByteArray solibPath =
QFileInfo(startParameters().dumperLibrary).path().toLocal8Bit();
const QString args = startParameters().processArgs.join(_(" "));
if (!remoteArch.isEmpty())
m_engine->postCommand("set architecture " + remoteArch);
if (!sysRoot.isEmpty())
m_engine->postCommand("set sysroot " + sysRoot);
if (!solibPath.isEmpty())
m_engine->postCommand("set solib-search-path " + solibPath);
if (!args.isEmpty())
m_engine->postCommand("-exec-arguments " + args.toLocal8Bit());
}
m_engine->postCommand("set target-async on", CB(handleSetTargetAsync));
......
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