diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:44:13 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-18 12:37:04 +0100 |
| commit | 13caf26b29283b544edc2974fa1ea0481c63b435 (patch) | |
| tree | c06077293de36f69c42b5e1a38844e2b8bbe07c4 /src/qml/compiler/qqmlirbuilder_p.h | |
| parent | 36fb7cf832e801a7b3718fa443ec2f1b83e0fea2 (diff) | |
| parent | 869efe4a49c5286493d7f039325992725bcac6c3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tools/qmllint/findunqualified.cpp
Change-Id: I2593b5cc0db1d14e0c944aec4b88a80f46f5b0c1
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h index 1f2c11f7f3..254d21001b 100644 --- a/src/qml/compiler/qqmlirbuilder_p.h +++ b/src/qml/compiler/qqmlirbuilder_p.h @@ -543,6 +543,7 @@ public: QList<QQmlJS::DiagnosticMessage> errors; QSet<QString> illegalNames; + QSet<QString> inlineComponentsNames; QList<const QV4::CompiledData::Import *> _imports; QList<Pragma*> _pragmas; |