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

Debugger: Disable stepping from QML->CPP for the time being

Browse Source 
Change-Id: Iafcc460a374bada67609dc1210cc1b787d267bfa
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Kai Koehne
2011-10-13 11:06:07 +02:00
parent f8700f19ae
commit be35fecf91
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,14 +322,18 @@ void QmlCppEngine::detachDebugger()
void QmlCppEngine::executeStep()
{
if (d->m_activeEngine == d->m_qmlEngine) {
QTC_CHECK(d->m_cppEngine->state() == InferiorRunOk);
if (d->m_cppEngine->setupQmlStep(true))
return; // Wait for callback to readyToExecuteQmlStep()
} else {
notifyInferiorRunRequested();
d->m_cppEngine->executeStep();
}
// TODO: stepping from qml -> cpp requires more thought
// if (d->m_activeEngine == d->m_qmlEngine) {
// QTC_CHECK(d->m_cppEngine->state() == InferiorRunOk);
// if (d->m_cppEngine->setupQmlStep(true))
// return; // Wait for callback to readyToExecuteQmlStep()
// } else {
// notifyInferiorRunRequested();
// d->m_cppEngine->executeStep();
// }
notifyInferiorRunRequested();
d->m_activeEngine->executeStep();
}
void QmlCppEngine::readyToExecuteQmlStep()