diff options
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index 10fc3f8407..e2e9d15479 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1986,8 +1986,6 @@ bool JSCodeGen::compileComponent(int contextObject) Q_ASSERT(componentBinding->type == QV4::CompiledData::Binding::Type_Object); contextObject = componentBinding->value.objectIndex; } - for (auto it = obj->inlineComponentsBegin(); it != obj->inlineComponentsEnd(); ++it) - compileComponent(it->objectIndex); return compileJavaScriptCodeInObjectsRecursively(contextObject, contextObject); } @@ -1998,6 +1996,9 @@ bool JSCodeGen::compileJavaScriptCodeInObjectsRecursively(int objectIndex, int s if (object->flags & QV4::CompiledData::Object::IsComponent && !object->isInlineComponent) return true; + for (auto it = object->inlineComponentsBegin(); it != object->inlineComponentsEnd(); ++it) + compileComponent(it->objectIndex); + if (object->functionsAndExpressions->count > 0) { QList<QmlIR::CompiledFunctionOrExpression> functionsToCompile; for (QmlIR::CompiledFunctionOrExpression *foe = object->functionsAndExpressions->first; foe; foe = foe->next) |