diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-07-04 16:07:50 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-05 09:05:55 +0000 |
commit | cfb17c44cf3ae1268d066ba414759068059a7bbd (patch) | |
tree | 58efa2997a5ac52b7d1f11ec0c8de2754f02f03b /src/qml/types/qquickworkerscript.cpp | |
parent | 79ceef9f467d065c6e921892e9cc4ed46a0183cc (diff) |
Simplify and unite handling of activation objects in Contexts
All ExecutionContexts (except for CatchContext) have or can have
some sort of activation object. Unify them in one pointer in
the ExecutionContext class, and unify it's handling where it's
actually the same.
Change-Id: I6750999ddbd5d1d74235ef4b34dcd7546c432541
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 6159355afc..6b7e3dee9f 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -365,7 +365,7 @@ void QQuickWorkerScriptEnginePrivate::processMessage(int id, const QByteArray &d QV4::ScopedCallData callData(scope, 2); callData->thisObject = workerEngine->global(); - callData->args[0] = qmlContext->d()->qml; // ### + callData->args[0] = qmlContext->d()->qml(); // ### callData->args[1] = value; f->call(scope, callData); if (scope.hasException()) { |