diff options
Diffstat (limited to 'src/declarative/qml/parser/qmljs.g')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 4ed75e8..41d6e2d 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -212,15 +212,15 @@ #ifndef QMLJSPARSER_P_H #define QMLJSPARSER_P_H +#include "qmljsglobal_p.h" #include "qmljsgrammar_p.h" #include "qmljsast_p.h" #include "qmljsengine_p.h" #include <QtCore/QList> +#include <QtCore/QString> -QT_BEGIN_NAMESPACE - -class QString; +QT_QML_BEGIN_NAMESPACE namespace QmlJS { @@ -388,7 +388,7 @@ protected: using namespace QmlJS; -QT_BEGIN_NAMESPACE +QT_QML_BEGIN_NAMESPACE void Parser::reallocateStack() { @@ -3022,12 +3022,12 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; return false; } -QT_END_NAMESPACE +QT_QML_END_NAMESPACE ./ /: -QT_END_NAMESPACE +QT_QML_END_NAMESPACE |