diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-11-28 09:31:10 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-19 16:30:19 +0100 |
commit | da2b7576daa58ad2881e41ad6f0f85ec55db4fd2 (patch) | |
tree | 1bb0dcfd7011f87aa1c238174205ce79c66273b6 /src/qml/qml/qqmlcontextwrapper.cpp | |
parent | 45f77a6bfc05b97e6312a379c63840243b5815f3 (diff) |
Return Heap::ExecutionContext for currentContext()
Change-Id: I155ab996e24d7f36761d2ea62a04774e16469b34
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper.cpp')
-rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index 0ce141cde8..a5c1f67532 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -290,7 +290,7 @@ void QmlContextWrapper::put(Managed *m, String *name, const ValueRef value) if (wrapper && wrapper->d()->readOnly) { QString error = QLatin1String("Invalid write to global property \"") + name->toQString() + QLatin1Char('"'); - Scoped<String> e(scope, v4->currentContext()->d()->engine->newString(error)); + Scoped<String> e(scope, v4->currentContext()->engine->newString(error)); v4->throwError(e); return; } |