diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:13:42 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:14:33 +0100 |
commit | d815621963cee5571ed93fb89561c4884a685b6b (patch) | |
tree | 4c60b5f69eff56fd324e4203d006e1df677670ce /src/qml/qml/v4/qv4irbuilder_p.h | |
parent | 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff) | |
parent | 471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff) |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'src/qml/qml/v4/qv4irbuilder_p.h')
-rw-r--r-- | src/qml/qml/v4/qv4irbuilder_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/qml/v4/qv4irbuilder_p.h b/src/qml/qml/v4/qv4irbuilder_p.h index 3aee38b269..86baae463d 100644 --- a/src/qml/qml/v4/qv4irbuilder_p.h +++ b/src/qml/qml/v4/qv4irbuilder_p.h @@ -46,8 +46,6 @@ #include "qv4ir_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QV4IRBuilder : public QQmlJS::AST::Visitor @@ -139,7 +137,9 @@ protected: virtual bool visit(QQmlJS::AST::StatementSourceElement *ast); // object literals - virtual bool visit(QQmlJS::AST::PropertyNameAndValueList *ast); + virtual bool visit(QQmlJS::AST::PropertyAssignmentList *ast); + virtual bool visit(QQmlJS::AST::PropertyNameAndValue *ast); + virtual bool visit(QQmlJS::AST::PropertyGetterSetter *ast); virtual bool visit(QQmlJS::AST::IdentifierPropertyName *ast); virtual bool visit(QQmlJS::AST::StringLiteralPropertyName *ast); virtual bool visit(QQmlJS::AST::NumericLiteralPropertyName *ast); @@ -236,6 +236,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QV4IRBUILDER_P_H |