summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/qmljslexer.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2009-09-17 10:19:27 (GMT)
committerErik Verbruggen <erik.verbruggen@nokia.com>2009-09-17 10:19:27 (GMT)
commit875c342b9f861c914e399f01142d70d65a6b39af (patch)
tree123a85c46e00c2773b27a445ac6993eead549d48 /src/declarative/qml/parser/qmljslexer.cpp
parentbec50e0b9cc1b536acc55776328152ceece65efe (diff)
downloadQt-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.cpp')
-rw-r--r--src/declarative/qml/parser/qmljslexer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
index f302733..f71b92f 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -43,6 +43,7 @@
#include "config.h"
#endif
+#include "qmljsglobal_p.h"
#include "qmljsengine_p.h"
#include "qmljslexer_p.h"
#include "qmljsgrammar_p.h"
@@ -52,7 +53,7 @@
#include <stdio.h>
#include <string.h>
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
extern double qstrtod(const char *s00, char const **se, bool *ok);
@@ -1147,6 +1148,6 @@ void Lexer::syncProhibitAutomaticSemicolon()
}
}
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE