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/qml/qqmltypeloader.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/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 0feedc19cd..de19fe3cd7 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2869,7 +2869,7 @@ QV4::ReturnedValue QQmlScriptData::scriptValueForContext(QQmlContextData *parent ep->warning(error); } - QV4::ScopedValue retval(scope, qmlContext->d()->qml); + QV4::ScopedValue retval(scope, qmlContext->d()->qml()); if (shared) { m_value.set(scope.engine, retval); m_loaded = true; |