diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-08 18:00:51 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-08 18:00:51 (GMT) |
| commit | e30d5a56506c4f677d18f9cb867f0bd50615b197 (patch) | |
| tree | 8e50f9b8884b4aca5b8bf3792ea220e0b35c0aab /src/declarative/qml | |
| parent | a764c32ee5cab4b40a0ce6807e1e7c3efcc7bdc8 (diff) | |
| parent | fb84fc866825f1f9f6d520cdcc2dcace7e7d77ea (diff) | |
| download | Qt-e30d5a56506c4f677d18f9cb867f0bd50615b197.zip Qt-e30d5a56506c4f677d18f9cb867f0bd50615b197.tar.gz Qt-e30d5a56506c4f677d18f9cb867f0bd50615b197.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/parser/qmljsglobal_p.h | 4 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsgrammar_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/qmljsglobal_p.h b/src/declarative/qml/parser/qmljsglobal_p.h index 59762ff..49e50cf 100644 --- a/src/declarative/qml/parser/qmljsglobal_p.h +++ b/src/declarative/qml/parser/qmljsglobal_p.h @@ -47,13 +47,13 @@ # define QT_QML_BEGIN_NAMESPACE # define QT_QML_END_NAMESPACE -# ifdef QML_BUILD_LIB +# ifdef QMLJS_BUILD_DIR # define QML_PARSER_EXPORT Q_DECL_EXPORT # elif QML_BUILD_STATIC_LIB # define QML_PARSER_EXPORT # else # define QML_PARSER_EXPORT Q_DECL_IMPORT -# endif // QML_BUILD_LIB +# endif // QMLJS_BUILD_DIR #else // !QT_CREATOR # define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h index 903e2c4..c2e2693 100644 --- a/src/declarative/qml/parser/qmljsgrammar_p.h +++ b/src/declarative/qml/parser/qmljsgrammar_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QmlJSGrammar { public: - enum { + enum VariousConstants { EOF_SYMBOL = 0, REDUCE_HERE = 99, SHIFT_THERE = 98, |