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

debugger: remove EngineRunOk state again

Browse Source
This commit is contained in:
hjk
2011-01-14 18:47:44 +01:00
parent cdee3dc6cd
commit bdfe2ed53b
6 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,18 +440,6 @@ void QmlCppEngine::slaveEngineStateChanged
notifyEngineRunFailed();
break;
case EngineRunOk:
if (otherEngine->state() == EngineRunOk) {
// This is conditionalized on isMasterEngine() in the
// base class, so do it here manually.
slaveEngine->setSilentState(InferiorRunOk);
otherEngine->setSilentState(InferiorRunOk);
notifyEngineRunAndInferiorRunOk();
} else {
qDebug() << "... WAITING FOR OTHER ENGINE RUN...";
}
break;
case InferiorRunRequested:
break;
@@ -461,11 +449,21 @@ void QmlCppEngine::slaveEngineStateChanged
break;
case InferiorRunOk:
qDebug() << "PLANNED INFERIOR RUN";
if (otherEngine->state() == InferiorRunOk)
notifyInferiorRunOk();
else
qDebug() << " **** INFERIOR RUN NOT OK ****";
if (state() == EngineRunRequested) {
if (otherEngine->state() == InferiorRunOk)
notifyEngineRunAndInferiorRunOk();
else if (otherEngine->state() == InferiorRunOk)
notifyEngineRunAndInferiorStopOk();
else
qDebug() << "... WAITING FOR OTHER INFERIOR RUN";
} else {
if (otherEngine->state() == InferiorRunOk) {
qDebug() << "PLANNED INFERIOR RUN";
notifyInferiorRunOk();
} else {
qDebug() << " **** INFERIOR RUN NOT OK ****";
}
}
break;