From f770cebdd3d6a7f31c21e1bf04d386178122bc84 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 14 Aug 2015 13:56:18 +0200 Subject: Refactor the way we declare signal parameter names Qml Connection objects where using an awkward way to make the parameter names of signals available to the signal handler. This now uses an approach that is equivalent to what we do with other functions. The main difference is that we can't know the parameter names at type compile time, so we have to rewrite the internal class of the QV4::Function at connect time. Change-Id: I5e538ac840b5a46ccb14ff71684404d947948324 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlobjectcreator.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlobjectcreator.cpp') diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index b55973cdc8..12415e1583 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -989,9 +989,8 @@ QV4::Heap::QmlContext *QQmlObjectCreator::currentQmlContext() { if (!_qmlContext->objectValue()) { QV4::Scope valueScope(v4); - QV4::Scoped qmlScope(valueScope, QV4::QmlContextWrapper::qmlScope(v4, context, _scopeObject)); QV4::ScopedContext global(valueScope, v4->rootContext()); - _qmlContext->setM(global->newQmlContext(qmlScope)); + _qmlContext->setM(global->newQmlContext(context, _scopeObject)); v4->popContext(); } return _qmlContext->d(); -- cgit v1.2.3