diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-18 11:14:56 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-19 11:28:27 +0000 |
commit | b7521acd2c77f9f7ace8d49cf1e11affe2ccbd21 (patch) | |
tree | 370f3069f8e75097990d12f8ae416f3d1f133cf8 /src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h | |
parent | c21bc1cdef5ae0f1e6bd43ac0a6c324a59d4e34b (diff) |
V4 debugger: Fix expression evaluation
We need to collect the refs in the debugService's list in order for
them to show up on addRefs() and we need to generate proper error
responses if either the debugger is not stopped or the evaluation
throws an exception.
Task-number: QTBUG-47797
Task-number: QTBUG-47816
Change-Id: I98f17c1f3976859ee50b9bfac41091276ff60982
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h index c91b77cb93..ebdde8f968 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h @@ -104,11 +104,13 @@ private: class ExpressionEvalJob: public QV4::Debugging::Debugger::JavaScriptJob { QV4DataCollector *collector; + QString exception; public: ExpressionEvalJob(QV4::ExecutionEngine *engine, int frameNr, const QString &expression, QV4DataCollector *collector); virtual void handleResult(QV4::ScopedValue &result); + const QString &exceptionMessage() const; }; class GatherSourcesJob: public QV4::Debugging::Debugger::Job |