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

debugger: enable forceful abort of mixed qml/cpp engine

Browse Source 
Change-Id: I815f0bf91e8ca58c9e472f81a234834dc341f29d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
hjk
2012-01-18 14:58:01 +01:00
committed by hjk
parent 70bcccd646
commit 31d5ec9cab
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,6 +505,13 @@ void QmlCppEngine::shutdownEngine()
d->m_cppEngine->shutdownSlaveEngine();
}
void QmlCppEngine::abortDebugger()
{
EDEBUG("\nMASTER ABORT DEBUGGER");
d->m_qmlEngine->abortDebugger();
d->m_cppEngine->abortDebugger();
}
void QmlCppEngine::setState(DebuggerState newState, bool forced)
{
EDEBUG("SET MASTER STATE: " << newState);

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

@@ -118,6 +118,7 @@ protected:
void runEngine();
void shutdownInferior();
void shutdownEngine();
void abortDebugger();
void notifyInferiorRunOk();
void notifyInferiorSpontaneousStop();