diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-09-17 10:19:27 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-09-17 10:19:27 (GMT) |
| commit | 875c342b9f861c914e399f01142d70d65a6b39af (patch) | |
| tree | 123a85c46e00c2773b27a445ac6993eead549d48 /src/declarative/qml/parser/qmljslexer_p.h | |
| parent | bec50e0b9cc1b536acc55776328152ceece65efe (diff) | |
| download | Qt-875c342b9f861c914e399f01142d70d65a6b39af.zip Qt-875c342b9f861c914e399f01142d70d65a6b39af.tar.gz Qt-875c342b9f861c914e399f01142d70d65a6b39af.tar.bz2 | |
Fixed the QML parser files to play nice when included in Creator, when
Creator is compiled against Qt with namespaces.
Diffstat (limited to 'src/declarative/qml/parser/qmljslexer_p.h')
| -rw-r--r-- | src/declarative/qml/parser/qmljslexer_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h index 6cca45d..50f7c4b 100644 --- a/src/declarative/qml/parser/qmljslexer_p.h +++ b/src/declarative/qml/parser/qmljslexer_p.h @@ -55,9 +55,9 @@ #include <QtCore/QString> +#include "qmljsglobal_p.h" - -QT_BEGIN_NAMESPACE +QT_QML_BEGIN_NAMESPACE namespace QmlJS { @@ -244,8 +244,6 @@ private: } // namespace QmlJS -QT_END_NAMESPACE - - +QT_QML_END_NAMESPACE #endif |