diff options
author | Liang Qi <liang.qi@qt.io> | 2018-03-22 09:06:34 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-03-22 09:06:34 +0100 |
commit | 115968f291cf802290c3b11b3ec4470646b31168 (patch) | |
tree | 55fff12104a4ea0b54052c4ec8c70b41b66ee136 /src/qml/qml/qqmlobjectcreator.cpp | |
parent | bfab67e51e9c030a24a59754842b7f96d6ff77c3 (diff) | |
parent | 214fbaa57b73296a0a191b5ff2b1fbc8bf0aaa7a (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/configure.json
src/qml/qml/qqmlengine.cpp
src/qml/types/qqmlmodelsmodule.cpp
src/qml/types/types.pri
Change-Id: I390112f8178c99b36741d3c40901e544c6daafaa
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
-rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 7c36f59035..7051fb51da 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -879,14 +879,6 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *bindingProper if (binding->type == QV4::CompiledData::Binding::Type_Script || binding->containsTranslations()) { if (binding->flags & QV4::CompiledData::Binding::IsSignalHandlerExpression) { QV4::Function *runtimeFunction = compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]; - - // When a user writes the following: - // onSignal: function() { doSomethingUsefull } - // then do not run the binding that returns the closure, but run the closure - // instead. - if (auto closure = runtimeFunction->nestedFunction()) - runtimeFunction = closure; - int signalIndex = _propertyCache->methodIndexToSignalIndex(bindingProperty->coreIndex()); QQmlBoundSignal *bs = new QQmlBoundSignal(_bindingTarget, signalIndex, _scopeObject, engine); QQmlBoundSignalExpression *expr = new QQmlBoundSignalExpression(_bindingTarget, signalIndex, |