diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-21 09:27:57 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-29 15:36:22 +0000 |
| commit | 75c7f093e0b8e321306ae1189b71866a9073df00 (patch) | |
| tree | 33edc7fb421b92091af9e5fbc654c1273ededfd0 /qtdeclarative.pro | |
| parent | 5a2e7087cbb11fce1f0f510ae7eb08b1e70e9989 (diff) | |
QML: Resolve conflict in ImportSpecifier rulev5.14.0-rc1
IdentifierReference could resolve to both ImpordBinding and
IdentifierName, causing ambiguity in the grammar, and ultimately
caused parse failues when parsing an import statement.
This is now resolved by explicitly telling the parser to prefer
shifting.
This is a partial cherry-pick. Apparently the effect observed in the
original change and fixed inline can also be triggered in different
ways.
(cherry-picked from commit 41bbf7e376d0e374dc7c4e2a5ed4157a1b880b4a)
Fixes: QTBUG-80423
Change-Id: Iaec29c452b577312248a17cb48f005f4fc0bd8c4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'qtdeclarative.pro')
0 files changed, 0 insertions, 0 deletions