diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-08-07 14:43:03 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:18:50 +0000 |
commit | eb2c08f57493aa12850e6cddff2cc3527e7cbfd7 (patch) | |
tree | be917321e6025a8ca8983881a1f07d1a0fd7680c /src/plugins | |
parent | e9a8252305fa5e3b3cd4a18261990820975a79da (diff) |
Get rid of ExecutionContext::strictMode
This should be done by generating different byte code for
the strict/non strict cases. For now the VME has a workaround
checking the isStrict() flag of QV4::Function.
Change-Id: I2faa9e9184ffc5274491067e67f665d6989b54c2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp index ebd28b36e0..80ead1516a 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp @@ -113,7 +113,7 @@ void JavaScriptJob::run() } QV4::Script script(ctx, this->script); - script.strictMode = ctx->d()->strictMode; + script.strictMode = ctx->d()->v4Function->isStrict(); // In order for property lookups in QML to work, we need to disable fast v4 lookups. That // is a side-effect of inheritContext. script.inheritContext = true; diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp index c4d5e5f683..7f11cea9ab 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp @@ -255,7 +255,7 @@ QV4::ReturnedValue NativeDebugger::evaluateExpression(const QString &expression) m_engine->pushContext(ctx); QV4::Script script(ctx, expression); - script.strictMode = ctx->d()->strictMode; + script.strictMode = ctx->d()->v4Function->isStrict(); // In order for property lookups in QML to work, we need to disable fast v4 lookups. // That is a side-effect of inheritContext. script.inheritContext = true; |