From 0c48277203b13ebc37fba4f4d111db7e6b7579a8 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 20 Aug 2015 16:05:30 +0200 Subject: 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 --- src/qml/qml/qqmlobjectcreator.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qml/qml') 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(); } -- cgit v1.2.3