diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-03-04 10:35:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 16:55:12 +0100 |
| commit | 39b54d7293741c712116010b33f0d9823ab2ab1c (patch) | |
| tree | 0af462863604bc130b1232a53477185b9d59c158 /src/qml/jsruntime/qv4debugging_p.h | |
| parent | 245f5ce7bb194438fc643e5c928382f47556e2f2 (diff) | |
Fixes to breakpoint handling
Make sure stepping works correctly, and we always
break at a valid breakpoint.
Change-Id: I6a3032b3ae204484b8a92b2031904a7f681c7f80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4debugging_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4debugging_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h index 9c97dd5f9e..47a7d77b28 100644 --- a/src/qml/jsruntime/qv4debugging_p.h +++ b/src/qml/jsruntime/qv4debugging_p.h @@ -161,14 +161,12 @@ public: void setBreakOnThrow(bool onoff); + // used for testing struct ExecutionState { - ExecutionState() : lineNumber(-1), function(0) {} QString fileName; int lineNumber; - Function *function; }; - ExecutionState currentExecutionState() const; bool pauseAtNextOpportunity() const { @@ -203,8 +201,8 @@ private: void runInEngine_havingLock(Debugger::Job *job); private: - QV4::ExecutionEngine *m_engine; + QV4::ExecutionContext *m_currentContext; DebuggerAgent *m_agent; QMutex m_lock; QWaitCondition m_runningCondition; @@ -212,7 +210,6 @@ private: Speed m_stepping; bool m_pauseRequested; bool m_haveBreakPoints; - bool m_stopForStepping; bool m_breakOnThrow; BreakPoints m_breakPoints; |