diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-03-15 14:30:53 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-03-15 14:30:53 (GMT) |
| commit | 83fe3a8e1f12ddfb6fc8d42f007816c122bed94d (patch) | |
| tree | de88bd0063d690c90dcc2554c64f1063a751e5a7 /src/declarative/qml/parser | |
| parent | e8da7d174a93e4c2c75ccdb4baacf676c91048ff (diff) | |
| download | Qt-83fe3a8e1f12ddfb6fc8d42f007816c122bed94d.zip Qt-83fe3a8e1f12ddfb6fc8d42f007816c122bed94d.tar.gz Qt-83fe3a8e1f12ddfb6fc8d42f007816c122bed94d.tar.bz2 | |
Compile with user defined Qt namespace
Protect the forward declaration of qstrtod with a QT_BEGIN/END namespace
Diffstat (limited to 'src/declarative/qml/parser')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejslexer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 34163a4..6404be3 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -56,9 +56,11 @@ #include <stdio.h> #include <string.h> -QT_QML_BEGIN_NAMESPACE - +QT_BEGIN_NAMESPACE extern double qstrtod(const char *s00, char const **se, bool *ok); +QT_END_NAMESPACE + +QT_QML_BEGIN_NAMESPACE #define shiftWindowsLineBreak() \ do { \ |