From 1249761a341ea2cd959a311d9a6523a3e9936887 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 6 Feb 2020 14:23:00 +0100 Subject: Make UiObjectDefinition uniform attributes are always at the end of AST objects, move them there also for UiObjectDefinition. Change-Id: I7630b1c40627913c3e7e46e752acf1d80203ce63 Reviewed-by: Fabian Kosmale --- src/qml/parser/qqmljsast_p.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/qml/parser') diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h index a5ef3ca67b..a8b15e6874 100644 --- a/src/qml/parser/qqmljsast_p.h +++ b/src/qml/parser/qqmljsast_p.h @@ -3414,10 +3414,6 @@ public: : name(inlineComponentName), component(inlineComponent) { kind = K; } - QStringRef name; - UiObjectDefinition* component; - SourceLocation componentToken; - SourceLocation lastSourceLocation() const override {return component->lastSourceLocation();} @@ -3425,6 +3421,11 @@ public: {return componentToken;} void accept0(Visitor *visitor) override; + + // attributes + QStringRef name; + UiObjectDefinition* component; + SourceLocation componentToken; }; class QML_PARSER_EXPORT UiSourceElement: public UiObjectMember -- cgit v1.2.3