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

Debugger: Merge EngineSetup and InferiorSetup start phases

Browse Source 
It was needed in the past to trigger e.g. gdbserver setup in
remote cases which is nowadays handled by separate RunWorkers.

Change-Id: I30bce071dab0779cce2e7abef7b31550d8539461
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-11-15 17:12:03 +01:00
parent 2427f1267f
commit 8f1a161c64
16 changed files with 90 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -371,13 +371,6 @@ void QmlCppEngine::setupEngine()
m_cppEngine->setupSlaveEngine();
}
void QmlCppEngine::setupInferior()
{
EDEBUG("\nMASTER SETUP INFERIOR");
m_qmlEngine->setupSlaveInferior();
m_cppEngine->setupSlaveInferior();
}
void QmlCppEngine::runEngine()
{
EDEBUG("\nMASTER RUN ENGINE");
@@ -465,20 +458,6 @@ void QmlCppEngine::slaveEngineStateChanged
notifyEngineSetupOk();
break;
}
case InferiorSetupRequested: {
// Set by queueSetupInferior()
CHECK_STATE(InferiorSetupRequested);
break;
}
case InferiorSetupFailed: {
m_qmlEngine->quitDebugger();
notifyInferiorSetupFailed();
break;
}
case InferiorSetupOk: {
notifyInferiorSetupOk();
break;
}
case EngineRunRequested: {
// set by queueRunEngine()
break;

1
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -105,7 +105,6 @@ protected:
void doUpdateLocals(const UpdateParameters &up) override;
void setupEngine() override;
void setupInferior() override;
void runEngine() override;
void shutdownInferior() override;
void shutdownEngine() override;

13
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -322,16 +322,6 @@ void QmlEngine::setState(DebuggerState state, bool forced)
updateCurrentContext();
}
void QmlEngine::setupInferior()
{
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
notifyInferiorSetupOk();
if (d->automaticConnect)
beginConnection();
}
void QmlEngine::handleLauncherStarted()
{
// FIXME: The QmlEngine never calls notifyInferiorPid() triggering the
@@ -593,6 +583,9 @@ void QmlEngine::shutdownEngine()
void QmlEngine::setupEngine()
{
notifyEngineSetupOk();
if (d->automaticConnect)
beginConnection();
}
void QmlEngine::continueInferior()

1
src/plugins/debugger/qml/qmlengine.h
View File

@@ -82,7 +82,6 @@ private:
void executeNextI() override;
void setupEngine() override;
void setupInferior() override;
void runEngine() override;
void shutdownInferior() override;
void shutdownEngine() override;