diff options
author | hjk <hjk@qt.io> | 2018-10-02 12:53:07 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-10-16 10:34:31 +0000 |
commit | fa96f731923facc1b051eef66baa8398dadb109b (patch) | |
tree | b11ef9a89befe8e6f2c8609585452433c7ca392c /src/plugins/debugger/qml/qmlengine.cpp | |
parent | 78fbb0826b1cc229f51406614b295cdf3073f88c (diff) |
Debugger: Rework step{In,Out,Over} handling
Main menu action pass operation to current engine, everything else
is handled there.
Combine execute{Step,Next} and execute{Step,Next}I functions.
Implementation were mostly similar, in some cases unneeded
(the instruction-wise version e.g. for Python)
Drop GDB-isms 'step', 'next' in favor of 'step in' and 'step over'.
Change-Id: I232232bc7a67d9d297a74f1c81dc43be96787d34
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index bbd7684bf9..81acdb66e0 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -610,15 +610,7 @@ void QmlEngine::interruptInferior() showStatusMessage(tr("Waiting for JavaScript engine to interrupt on next statement.")); } -void QmlEngine::executeStep() -{ - clearExceptionSelection(); - d->continueDebugging(StepIn); - notifyInferiorRunRequested(); - notifyInferiorRunOk(); -} - -void QmlEngine::executeStepI() +void QmlEngine::executeStepIn(bool) { clearExceptionSelection(); d->continueDebugging(StepIn); @@ -634,7 +626,7 @@ void QmlEngine::executeStepOut() notifyInferiorRunOk(); } -void QmlEngine::executeNext() +void QmlEngine::executeStepOver(bool) { clearExceptionSelection(); d->continueDebugging(Next); @@ -642,11 +634,6 @@ void QmlEngine::executeNext() notifyInferiorRunOk(); } -void QmlEngine::executeNextI() -{ - executeNext(); -} - void QmlEngine::executeRunToLine(const ContextData &data) { QTC_ASSERT(state() == InferiorStopOk, qDebug() << state()); |