diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2021-04-19 14:44:33 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-19 16:58:33 +0000 |
| commit | d54bf8c57a85bf29c0b795e417adb16b7f900cee (patch) | |
| tree | 15d26be8ecd92fe7fa77ad0f642f39688b683487 /src/qml/compiler | |
| parent | 45813ec8027a90e795c2c71b5da7929b038193e2 (diff) | |
qqmlirbuilder: Fix treating parser warnings as errros
Previously parser warnings (i.e. inline components having lowercase names) were treated as errors.
Because these were not handled properly this also resulted in the QQmlComponent with the warning never becoming ready.
This resulted applications hanging instead of terminating.
Change-Id: Ia5ad3b54edc1b94dd94d0bf771c3494691abec71
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit e49be8d2b1b7acb310873a63f46980d1f0296f95)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index fa25d41113..1551c9be71 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -443,7 +443,9 @@ bool IRBuilder::generateFromQml(const QString &code, const QString &url, Documen errors << m; } - return false; + + if (!errors.isEmpty() || !parseResult) + return false; } program = parser.ast(); Q_ASSERT(program); |