diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
| commit | 0c558e05f880cb51078b2d5e5281227352c1de3f (patch) | |
| tree | 809e95ab06fc5d757c1d66493de5c9376866aee1 /src/declarative/qml/parser/qdeclarativejsgrammar_p.h | |
| parent | af81ea8a5abbd9a94eb6ab5c3fe0425779905d5a (diff) | |
| parent | 48fd47f64f3f73e82016161d82cdf67908a9c653 (diff) | |
| download | Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.zip Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.gz Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejsgrammar_p.h')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejsgrammar_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h index 2b2e3d1..32bb12b 100644 --- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h +++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeJSGrammar { public: - enum { + enum VariousConstants { EOF_SYMBOL = 0, REDUCE_HERE = 100, SHIFT_THERE = 99, |