From cc3efc47f28af7cd39aa7ca25e91d10e00a1d9fa Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Fri, 2 Mar 2012 10:59:55 +0100
Subject: [PATCH] QmlCppDebugging: Always Delegate call to Cpp Engine
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>
---
src/plugins/debugger/qml/qmlcppengine.cpp | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 08a3cd7e471..d8e07e28628 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -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();
}
--
GitLab