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

Debugger: Synchronize slave engine inferior setup phases again

Browse Source 
This reverts most of 4977c915 and applies the same pattern for
setupEngine. Turns out that the removal was premature due
to the special needs of Android setup.

Task-number: QTCREATORBUG-19199
Change-Id: I4e2ff4f34a842f3296999a0651e7e8fd6470198c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-11-06 17:19:35 +01:00
parent ae40f434e8
commit 83ff62aa13
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/debuggerengine.cpp
View File

@@ -226,7 +226,6 @@ public:
this, &DebuggerEnginePrivate::resetLocation);
}
void doSetupEngine();
void doRunEngine();
void doShutdownEngine();
void doShutdownInferior();
@@ -512,8 +511,9 @@ void DebuggerEngine::start()
// });
// }
d->doSetupEngine();
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
setState(EngineSetupRequested);
showMessage("CALL: SETUP ENGINE");
setupEngine();
}
void DebuggerEngine::resetLocation()
@@ -639,14 +639,9 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to)
void DebuggerEngine::setupSlaveEngine()
{
QTC_CHECK(state() == DebuggerNotReady);
d->doSetupEngine();
}
void DebuggerEnginePrivate::doSetupEngine()
{
m_engine->setState(EngineSetupRequested);
m_engine->showMessage("CALL: SETUP ENGINE");
m_engine->setupEngine();
setState(EngineSetupRequested);
showMessage("CALL: SETUP SLAVE ENGINE");
setupEngine();
}
void DebuggerEngine::notifyEngineSetupFailed()
@@ -676,6 +671,15 @@ void DebuggerEngine::notifyEngineSetupOk()
setState(InferiorSetupRequested);
showMessage("CALL: SETUP INFERIOR");
d->m_progress.setProgressValue(250);
if (isMasterEngine())
setupInferior();
}
void DebuggerEngine::setupSlaveInferior()
{
QTC_CHECK(state() == EngineSetupOk);
setState(InferiorSetupRequested);
showMessage("CALL: SETUP SLAVE INFERIOR");
setupInferior();
}