Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/qml/common/qv4compileddata_p.h
	tests/auto/qml/qmlmin/tst_qmlmin.cpp

Change-Id: Ieabc9e0729630de6a8644024d11b765f35199f29

1 files changed, 24 insertions, 1 deletions

diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index a7c95eee2d..446704be91 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -259,7 +259,8 @@ public:
         Kind_UiHeaderItemList,
         Kind_UiEnumDeclaration,
         Kind_UiEnumMemberList,
-        Kind_UiVersionSpecifier
+        Kind_UiVersionSpecifier,
+        Kind_UiRequired
     };
 
     inline Node() {}
@@ -3106,6 +3107,28 @@ public:
     SourceLocation semicolonToken;
 };
 
+class QML_PARSER_EXPORT UiRequired: public Node
+{
+public:
+    QQMLJS_DECLARE_AST_NODE(UiRequired)
+
+    UiRequired(QStringRef name)
+        :name(name)
+    { kind = K; }
+
+    void accept0(Visitor *visitor) override;
+
+    SourceLocation firstSourceLocation() const override
+    { return requiredToken; }
+
+    SourceLocation lastSourceLocation() const override
+    { return semicolonToken; }
+
+    QStringRef name;
+    SourceLocation requiredToken;
+    SourceLocation semicolonToken;
+};
+
 class QML_PARSER_EXPORT UiHeaderItemList: public Node
 {
 public: