aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/parser/qqmljsastfwd_p.h
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-20 09:13:42 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-03-20 09:14:33 +0100
commitd815621963cee5571ed93fb89561c4884a685b6b (patch)
tree4c60b5f69eff56fd324e4203d006e1df677670ce /src/qml/qml/parser/qqmljsastfwd_p.h
parent9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff)
parent471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff)
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'src/qml/qml/parser/qqmljsastfwd_p.h')
-rw-r--r--src/qml/qml/parser/qqmljsastfwd_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/parser/qqmljsastfwd_p.h b/src/qml/qml/parser/qqmljsastfwd_p.h
index 67868234b2..fe5572c4b2 100644
--- a/src/qml/qml/parser/qqmljsastfwd_p.h
+++ b/src/qml/qml/parser/qqmljsastfwd_p.h
@@ -98,7 +98,9 @@ class ArrayLiteral;
class ObjectLiteral;
class ElementList;
class Elision;
-class PropertyNameAndValueList;
+class PropertyAssignmentList;
+class PropertyGetterSetter;
+class PropertyNameAndValue;
class PropertyName;
class IdentifierPropertyName;
class StringLiteralPropertyName;