diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-24 16:18:11 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-15 07:37:26 +0000 |
| commit | 830376c9621dc8ada8e63b8b15f9abf856facfef (patch) | |
| tree | 87bb68f0d17d7ceecdaf49991b810e1a9bd5d537 /src/qml/jsapi | |
| parent | 0e6195a85c5b9beceac719a7ea0c1389667bfcb3 (diff) | |
Rename currentExecutionContext to currentContext
Now that the other method is gone, let's use
the shorter currentContext
Change-Id: I2a6fb3b77f83a1ffdf314ad29081e303d17030ed
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 3ca05b90c1..b217d3fb4c 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -319,7 +319,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in QV4::Scope scope(v4); QV4::ExecutionContextSaver saver(scope); - QV4::ExecutionContext *ctx = v4->currentExecutionContext; + QV4::ExecutionContext *ctx = v4->currentContext; if (ctx->d() != v4->rootContext()->d()) ctx = v4->pushGlobalContext(); QV4::ScopedValue result(scope); |