From 864c1da05b07afe38969d27ef866edfeaa9311ec Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@qt.io>
Date: Tue, 20 Jul 2021 11:48:55 +0200
Subject: [PATCH] qmljs: fix order in BoundName

constructor and field order should be consistent

Change-Id: If698fd66cf67ab54c4be1638f19d758a54e33d5f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/qmljs/parser/parser.patch | 4 ++--
 src/libs/qmljs/parser/qmljsast_p.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/qmljs/parser/parser.patch b/src/libs/qmljs/parser/parser.patch
index cbdbf94d1fa..6cc100575d9 100644
--- a/src/libs/qmljs/parser/parser.patch
+++ b/src/libs/qmljs/parser/parser.patch
@@ -334,12 +334,12 @@ index ba1f642629..e286571e2e 100644
      SourceLocation majorToken;
      SourceLocation minorToken;
  };
-@@ -880,14 +879,13 @@ struct QML_PARSER_EXPORT BoundName
+@@ -880,12 +879,11 @@ struct QML_PARSER_EXPORT BoundName
      };
 
      QString id;
--    Type typeAnnotationType;
 -    TypeAnnotation *typeAnnotation;
+-    Type typeAnnotationType;
 +    QTaggedPointer<TypeAnnotation, Type> typeAnnotation;
      BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
 -    : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)
diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h
index a2ddcea5949..b51dd16c568 100644
--- a/src/libs/qmljs/parser/qmljsast_p.h
+++ b/src/libs/qmljs/parser/qmljsast_p.h
@@ -880,8 +880,8 @@ struct QML_PARSER_EXPORT BoundName
     };
 
     QString id;
-    Type typeAnnotationType;
     TypeAnnotation *typeAnnotation;
+    Type typeAnnotationType;
     BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
     : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)
     {}