diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-10-27 16:54:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-28 12:46:51 +0000 |
| commit | cdfb593985496f70b33e295f35b84c8dcf494cc2 (patch) | |
| tree | 74b1d305e4c5e1b48549f4f23e28e86137ada06e /src/qml/qml | |
| parent | 0135942bb3dffeed15aa78ca01f480575d85acef (diff) | |
Inline components: Fix custom parser support
Fixes: QTBUG-85713
Fixes: QTBUG-87464
Change-Id: I5c190ad2d02190de90260042cc06e51c1da01c63
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 2425cd478138c52694aaa20b7f7eb4a91d97b51c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmltypecompiler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index 058bf8848c..f1a6b3bff2 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -683,6 +683,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) @@ -1223,6 +1226,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); } |