diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-06 09:23:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:11 +0200 |
| commit | 9744e8bd423d528165f5e78704c6e017852b8e9a (patch) | |
| tree | b1210199c698d3b09d80b9267d9aaab2b12ac5ab /src/qml/jsapi | |
| parent | f3f31957b79c55f3e076473b0d4c41c8872535b3 (diff) | |
Convert ExecutionContext to new storage scheme
Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 3c3a32370c..929361bf72 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -309,7 +309,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in QV4::ScopedValue result(scope); QV4::Script script(ctx, program, fileName, lineNumber); - script.strictMode = ctx->strictMode; + script.strictMode = ctx->d()->strictMode; script.inheritContext = true; script.parse(); if (!scope.engine->hasException) diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 502fa1e64f..04e2d2802c 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -385,7 +385,7 @@ double QJSValue::toNumber() const QV4::ExecutionContext *ctx = d->engine ? d->engine->currentContext() : 0; double dbl = d->value.toNumber(); - if (ctx && ctx->engine->hasException) { + if (ctx && ctx->d()->engine->hasException) { ctx->catchException(); return 0; } @@ -411,7 +411,7 @@ bool QJSValue::toBool() const QV4::ExecutionContext *ctx = d->engine ? d->engine->currentContext() : 0; bool b = d->value.toBoolean(); - if (ctx && ctx->engine->hasException) { + if (ctx && ctx->d()->engine->hasException) { ctx->catchException(); return false; } @@ -437,7 +437,7 @@ qint32 QJSValue::toInt() const QV4::ExecutionContext *ctx = d->engine ? d->engine->currentContext() : 0; qint32 i = d->value.toInt32(); - if (ctx && ctx->engine->hasException) { + if (ctx && ctx->d()->engine->hasException) { ctx->catchException(); return 0; } @@ -463,7 +463,7 @@ quint32 QJSValue::toUInt() const QV4::ExecutionContext *ctx = d->engine ? d->engine->currentContext() : 0; quint32 u = d->value.toUInt32(); - if (ctx && ctx->engine->hasException) { + if (ctx && ctx->d()->engine->hasException) { ctx->catchException(); return 0; } |