forked from qt-creator/qt-creator
BareMetal: Remove last uses of the remote setup sub-statemachinery
Change-Id: I295f1fda6dc82c74769bc78f2074480b83dd7a0a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -33,7 +33,6 @@
|
||||
|
||||
#include <debugger/debuggerruncontrol.h>
|
||||
#include <debugger/debuggerkitinformation.h>
|
||||
#include <debugger/analyzer/analyzermanager.h>
|
||||
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/buildsteplist.h>
|
||||
@@ -175,7 +174,7 @@ void BareMetalDebugSupport::remoteErrorOutputMessage(const QByteArray &output)
|
||||
void BareMetalDebugSupport::remoteProcessStarted()
|
||||
{
|
||||
QTC_ASSERT(m_state == StartingRunner, return);
|
||||
adapterSetupDone();
|
||||
m_state = Running;
|
||||
}
|
||||
|
||||
void BareMetalDebugSupport::appRunnerFinished(bool success)
|
||||
@@ -187,10 +186,7 @@ void BareMetalDebugSupport::appRunnerFinished(bool success)
|
||||
if (!success)
|
||||
notifyInferiorIll();
|
||||
} else if (m_state == StartingRunner) {
|
||||
Debugger::RemoteSetupResult result;
|
||||
result.success = false;
|
||||
result.reason = tr("Debugging failed.");
|
||||
notifyEngineRemoteSetupFinished(result);
|
||||
reportFailure(tr("Debugging failed."));
|
||||
}
|
||||
|
||||
reset();
|
||||
@@ -211,22 +207,10 @@ void BareMetalDebugSupport::appRunnerError(const QString &error)
|
||||
}
|
||||
}
|
||||
|
||||
void BareMetalDebugSupport::adapterSetupDone()
|
||||
{
|
||||
m_state = Running;
|
||||
Debugger::RemoteSetupResult result;
|
||||
result.success = true;
|
||||
notifyEngineRemoteSetupFinished(result);
|
||||
}
|
||||
|
||||
void BareMetalDebugSupport::adapterSetupFailed(const QString &error)
|
||||
{
|
||||
debuggingFinished();
|
||||
|
||||
Debugger::RemoteSetupResult result;
|
||||
result.success = false;
|
||||
result.reason = tr("Initial setup failed: %1").arg(error);
|
||||
notifyEngineRemoteSetupFinished(result);
|
||||
reportFailure(tr("Initial setup failed: %1").arg(error));
|
||||
}
|
||||
|
||||
void BareMetalDebugSupport::setFinished()
|
||||
|
@@ -53,7 +53,6 @@ private:
|
||||
void progressReport(const QString &progressOutput);
|
||||
void appRunnerError(const QString &error);
|
||||
|
||||
void adapterSetupDone();
|
||||
void adapterSetupFailed(const QString &error);
|
||||
|
||||
void startExecution();
|
||||
|
Reference in New Issue
Block a user