From be35fecf911388d315e4e83152adbb9c831eae89 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 13 Oct 2011 11:06:07 +0200 Subject: [PATCH] Debugger: Disable stepping from QML->CPP for the time being Change-Id: Iafcc460a374bada67609dc1210cc1b787d267bfa Reviewed-by: Aurindam Jana Reviewed-by: hjk --- src/plugins/debugger/qml/qmlcppengine.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 45254840755..ba2f7aaa0c8 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -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()