diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-08 16:03:58 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-09 11:10:28 +0100 |
| commit | 4b2eabdf21ff71d557bae36f99cf3998dafe324c (patch) | |
| tree | 062b720a786a6795eeaec614b6215605b6a19732 /src | |
| parent | 9c7b761fe369f8ccd7486acc7d875917613cdeed (diff) | |
Return errors if validation of inline components fails
Fixes: QTBUG-90038
Change-Id: Ic01b5d097e0b9e6720bcec7ccb18c22abb5418f4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 001596d472557bca08eb93159e724301dea88ad6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 3cc7cc843a..b108884e21 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -101,7 +101,9 @@ QVector<QQmlError> QQmlPropertyValidator::validateObject( { const QV4::CompiledData::Object *obj = compilationUnit->objectAt(objectIndex); for (auto it = obj->inlineComponentsBegin(); it != obj->inlineComponentsEnd(); ++it) { - validateObject(it->objectIndex, /* instantiatingBinding*/ nullptr); + const auto errors = validateObject(it->objectIndex, /* instantiatingBinding*/ nullptr); + if (!errors.isEmpty()) + return errors; } if (obj->flags & QV4::CompiledData::Object::IsComponent && !(obj->flags & QV4::CompiledData::Object::IsInlineComponentRoot)) { |