From 2425cd478138c52694aaa20b7f7eb4a91d97b51c Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 27 Oct 2020 16:54:01 +0100 Subject: Inline components: Fix custom parser support Fixes: QTBUG-85713 Fixes: QTBUG-87464 Pick-to: 5.15 5.15.2 Change-Id: I5c190ad2d02190de90260042cc06e51c1da01c63 Reviewed-by: Maximilian Goldstein Reviewed-by: Ulf Hermann --- src/qml/qml/qqmltypecompiler.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index b885cae79c..a5660e2d53 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -700,6 +700,9 @@ QQmlCustomParserScriptIndexer::QQmlCustomParserScriptIndexer(QQmlTypeCompiler *t void QQmlCustomParserScriptIndexer::annotateBindingsWithScriptStrings() { scanObjectRecursively(/*root object*/0); + for (int i = 0; i < qmlObjects.size(); ++i) + if (qmlObjects.at(i)->isInlineComponent) + scanObjectRecursively(i); } void QQmlCustomParserScriptIndexer::scanObjectRecursively(int objectIndex, bool annotateScriptBindings) @@ -1247,6 +1250,9 @@ QQmlDeferredAndCustomParserBindingScanner::QQmlDeferredAndCustomParserBindingSca bool QQmlDeferredAndCustomParserBindingScanner::scanObject() { + for (int i = 0; i < qmlObjects->size(); ++i) + if (qmlObjects->at(i)->isInlineComponent) + scanObject(i); return scanObject(/*root object*/0); } -- cgit v1.2.3