aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/parser
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@qt.io>2020-02-06 14:23:00 +0100
committerFawzi Mohamed <fawzi.mohamed@qt.io>2020-02-12 10:17:34 +0100
commit1249761a341ea2cd959a311d9a6523a3e9936887 (patch)
tree8a31508bd4c5cd1c550a6c1291941a651b8166de /src/qml/parser
parent9b1dc349a58f82d130feb73dcd30f3766c924d20 (diff)
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/parser')
-rw-r--r--src/qml/parser/qqmljsast_p.h9
1 files changed, 5 insertions, 4 deletions
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