Tweak QML property syntax

The syntax is now

[default] property <type> <name> [ : <expression> ]

where name is one of "int", "bool", "double", "real", "string", "color", "date", "var" or "variant"

1 files changed, 6 insertions, 6 deletions

diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index 4aa89c9..f32a48c 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2336,7 +2336,7 @@ public:
     { kind = K; }
 
     virtual SourceLocation firstSourceLocation() const
-    { return publicToken; }
+    { return propertyToken; }
 
     virtual SourceLocation lastSourceLocation() const
     {
@@ -2346,9 +2346,9 @@ public:
 	return colonToken;
       else if (identifierToken.isValid())
 	return identifierToken;
-      else if (attributeTypeToken.isValid())
-	return attributeTypeToken;
-      return publicToken;
+      else if (typeToken.isValid())
+	return typeToken;
+      return propertyToken;
     }
 
     virtual void accept0(Visitor *visitor);
@@ -2358,8 +2358,8 @@ public:
     JavaScriptNameIdImpl *name;
     ExpressionNode *expression;
     bool isDefaultMember;
-    SourceLocation publicToken;
-    SourceLocation attributeTypeToken;
+    SourceLocation propertyToken;
+    SourceLocation typeToken;
     SourceLocation identifierToken;
     SourceLocation colonToken;
 };