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

QmlCppDebugging: Always Delegate call to Cpp Engine

Browse Source 
Mixed Engine delegates all calls to CppEngine. The state transitions
of the cpp engine ensure that the qmlengine is called correctly.

Change-Id: I7490858a91f5120a83b781ca605ad157e19d7949
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-02 10:59:55 +01:00
committed by Kai Koehne
parent 014862b773
commit cc3efc47f2
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,34 +459,24 @@ void QmlCppEngine::runEngine()
void QmlCppEngine::shutdownInferior()
{
EDEBUG("\nMASTER SHUTDOWN INFERIOR");
d->m_cppEngine->quitDebugger();
d->m_qmlEngine->quitDebugger();
d->m_cppEngine->shutdownInferior();
}
void QmlCppEngine::shutdownEngine()
{
EDEBUG("\nMASTER SHUTDOWN ENGINE");
d->m_qmlEngine->shutdownSlaveEngine();
d->m_cppEngine->shutdownSlaveEngine();
}
void QmlCppEngine::quitDebugger()
{
// we might get called multiple times
if (targetState() == DebuggerFinished)
return;
EDEBUG("\nMASTER QUIT DEBUGGER");
setTargetState(DebuggerFinished);
d->m_qmlEngine->quitDebugger();
d->m_cppEngine->quitDebugger();
}
void QmlCppEngine::abortDebugger()
{
EDEBUG("\nMASTER ABORT DEBUGGER");
setTargetState(DebuggerFinished);
d->m_qmlEngine->abortDebugger();
d->m_cppEngine->abortDebugger();
}