diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-20 16:05:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-08 18:34:19 +0000 |
| commit | 0c48277203b13ebc37fba4f4d111db7e6b7579a8 (patch) | |
| tree | e570a3a9fbb7f1daee469d4058014544acb78612 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 548cc400a780f795cceef0eb841191a3669f58f2 (diff) | |
Don't push new QML contexts onto the context stack
When creating new QML contexts, these are not used directly,
but rather as scopes for other functions. Change the
behavior, so that newQmlContext doesn't push the new context
onto the context stack.
Change-Id: I8254da3f660c4791941835c925b9892274ea51b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 12415e1583..ed58df843b 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -991,7 +991,6 @@ QV4::Heap::QmlContext *QQmlObjectCreator::currentQmlContext() QV4::Scope valueScope(v4); QV4::ScopedContext global(valueScope, v4->rootContext()); _qmlContext->setM(global->newQmlContext(context, _scopeObject)); - v4->popContext(); } return _qmlContext->d(); } |