From: Christiaan Janssen Date: Wed, 2 Feb 2011 12:35:42 +0000 (+0100) Subject: QmlCppDebugger: frame change now managed by DebuggerEngine X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a3d9c14b941d8321063a310e00a992a446eac07;p=qt-creator-jp%2Fqt-creator-jp.git QmlCppDebugger: frame change now managed by DebuggerEngine reviewed-by: hjk --- diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index e3ebb7eab2..91fac94d40 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -171,6 +171,7 @@ void QmlCppEngine::activateFrame(int index) d->m_qmlEngine->activateFrame(index - d->m_stackBoundary); else d->m_cppEngine->activateFrame(index); + stackHandler()->setCurrentIndex(index); } void QmlCppEngine::reloadModules() @@ -369,16 +370,6 @@ void QmlCppEngine::executeDebuggerCommand(const QString &command) d->m_cppEngine->executeDebuggerCommand(command); } -void QmlCppEngine::frameUp() -{ - d->m_activeEngine->frameUp(); -} - -void QmlCppEngine::frameDown() -{ - d->m_activeEngine->frameDown(); -} - ///////////////////////////////////////////////////////// void QmlCppEngine::setupEngine() diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index a3e652edf9..20fb497f05 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -75,9 +75,6 @@ protected: void executeJumpToLine(const QString &fileName, int lineNumber); void executeDebuggerCommand(const QString &command); - void frameUp(); - void frameDown(); - void setupEngine(); void setupInferior(); void runEngine();