aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4debugging_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-08-18 11:14:56 +0200
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-08-19 11:28:27 +0000
commitb7521acd2c77f9f7ace8d49cf1e11affe2ccbd21 (patch)
tree370f3069f8e75097990d12f8ae416f3d1f133cf8 /src/qml/jsruntime/qv4debugging_p.h
parentc21bc1cdef5ae0f1e6bd43ac0a6c324a59d4e34b (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/qml/jsruntime/qv4debugging_p.h')
-rw-r--r--src/qml/jsruntime/qv4debugging_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h
index ac0c934d42..86faba45f7 100644
--- a/src/qml/jsruntime/qv4debugging_p.h
+++ b/src/qml/jsruntime/qv4debugging_p.h
@@ -95,10 +95,12 @@ public:
QV4::ExecutionEngine *engine;
int frameNr;
const QString &script;
+ bool resultIsException;
public:
JavaScriptJob(QV4::ExecutionEngine *engine, int frameNr, const QString &script);
void run();
+ bool hasExeption() const;
protected:
virtual void handleResult(QV4::ScopedValue &result) = 0;