Fixed the QML parser files to play nice when included in Creator, when

Creator is compiled against Qt with namespaces.

16 files changed, 550 insertions, 521 deletions

diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
index 1f553f6..986b146 100644
--- a/src/declarative/qml/parser/parser.pri
+++ b/src/declarative/qml/parser/parser.pri
@@ -10,7 +10,8 @@ HEADERS += $$PWD/qmljsast_p.h \
            $$PWD/qmljslexer_p.h \
            $$PWD/qmljsmemorypool_p.h \
            $$PWD/qmljsnodepool_p.h \
-           $$PWD/qmljsparser_p.h
+           $$PWD/qmljsparser_p.h \
+           $$PWD/qmljsglobal_p.h
 
 SOURCES += $$PWD/qmljsast.cpp \
            $$PWD/qmljsastvisitor.cpp \
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
 
 
 
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
index 2c08877..bacf70f 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -54,9 +54,10 @@
 //
 
 #include "qmljsastvisitor_p.h"
+#include "qmljsglobal_p.h"
 #include <QtCore/QString>
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 #define QMLJS_DECLARE_AST_NODE(name) \
   enum { K = Kind_##name };
@@ -2666,6 +2667,6 @@ public:
 
 
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif
diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h
index a6fee1d..fcb97ad 100644
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ b/src/declarative/qml/parser/qmljsastfwd_p.h
@@ -43,6 +43,7 @@
 #define QMLJSAST_FWD_P_H
 
 #include <QtCore/qglobal.h>
+#include "qmljsglobal_p.h"
 
 //
 //  W A R N I N G
@@ -55,7 +56,7 @@
 // We mean it.
 //
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS { namespace AST {
 
@@ -182,6 +183,6 @@ class UiSignature;
 
 } } // namespace AST
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif
diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h
index 237640f..eea492a 100644
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ b/src/declarative/qml/parser/qmljsastvisitor_p.h
@@ -54,8 +54,9 @@
 //
 
 #include "qmljsastfwd_p.h"
+#include "qmljsglobal_p.h"
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS { namespace AST {
 
@@ -329,6 +330,6 @@ public:
 
 } } // namespace AST
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif // QMLJSASTVISITOR_P_H
diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp
index eab8944..7d4d6d7 100644
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ b/src/declarative/qml/parser/qmljsengine_p.cpp
@@ -39,12 +39,13 @@
 **
 ****************************************************************************/
 
+#include "qmljsglobal_p.h"
 #include "qmljsengine_p.h"
 #include "qmljsnodepool_p.h"
 #include <qnumeric.h>
 #include <QHash>
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 
@@ -206,4 +207,4 @@ void Engine::setNodePool(NodePool *nodePool)
 
 } // end of namespace QmlJS
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h
index 877fff2..8627a99 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -56,9 +56,10 @@
 #include <QString>
 #include <QSet>
 
+#include "qmljsglobal_p.h"
 #include "qmljsastfwd_p.h"
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 class NameId
@@ -167,6 +168,6 @@ public:
 
 } // end of namespace QmlJS
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif // QMLJSENGINE_P_H
diff --git a/src/declarative/qml/parser/qmljsglobal_p.h b/src/declarative/qml/parser/qmljsglobal_p.h
new file mode 100644
index 0000000..675c67b
--- /dev/null
+++ b/src/declarative/qml/parser/qmljsglobal_p.h
@@ -0,0 +1,14 @@
+#ifndef QMLJSGLOBAL_P_H
+#define QMLJSGLOBAL_P_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef QT_CREATOR
+#define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
+#define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+#else // !QT_CREATOR
+#define QT_QML_BEGIN_NAMESPACE
+#define QT_QML_END_NAMESPACE
+#endif // QT_CREATOR
+
+#endif // QMLJSGLOBAL_P_H
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 60edb0a..868c421 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -51,44 +51,44 @@ const char *const QmlJSGrammar::spell [] = {
   "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", 
   ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
   "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
-  "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "public", "import", 
-  "as", 0, 0, 0, 0, 0};
+  "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
+  "import", "as", 0, 0, 0, 0, 0};
 
 const int QmlJSGrammar::lhs [] = {
-  96, 96, 96, 97, 100, 100, 103, 103, 105, 104, 
-  104, 104, 104, 104, 104, 104, 104, 107, 102, 101, 
-  110, 110, 112, 112, 113, 113, 109, 111, 111, 111, 
-  111, 111, 111, 111, 119, 119, 119, 120, 120, 121, 
-  121, 111, 111, 111, 111, 111, 111, 111, 111, 111, 
-  111, 111, 111, 111, 111, 111, 111, 108, 108, 108, 
-  108, 124, 124, 124, 124, 124, 124, 124, 124, 124, 
-  124, 124, 124, 124, 124, 124, 124, 124, 124, 114, 
-  126, 126, 126, 126, 125, 125, 128, 128, 130, 130, 
-  130, 130, 130, 130, 131, 131, 131, 131, 131, 131, 
-  131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 
-  131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 
-  131, 131, 131, 131, 131, 132, 132, 106, 106, 106, 
-  106, 106, 135, 135, 136, 136, 136, 136, 134, 134, 
-  137, 137, 138, 138, 139, 139, 139, 140, 140, 140, 
-  140, 140, 140, 140, 140, 140, 140, 141, 141, 141, 
-  141, 142, 142, 142, 143, 143, 143, 143, 144, 144, 
-  144, 144, 144, 144, 144, 145, 145, 145, 145, 145, 
-  145, 146, 146, 146, 146, 146, 147, 147, 147, 147, 
-  147, 148, 148, 149, 149, 150, 150, 151, 151, 152, 
-  152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 
-  157, 158, 158, 159, 159, 129, 129, 160, 160, 161, 
-  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
-  161, 99, 99, 162, 162, 163, 163, 164, 164, 98, 
-  98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 
-  98, 98, 98, 98, 115, 176, 176, 175, 175, 123, 
-  123, 177, 177, 178, 178, 180, 180, 179, 181, 184, 
-  182, 182, 185, 183, 183, 116, 117, 117, 118, 118, 
-  165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 
-  166, 167, 167, 167, 167, 168, 168, 169, 171, 186, 
-  186, 189, 189, 187, 187, 190, 188, 170, 170, 170, 
-  172, 172, 173, 173, 173, 191, 192, 174, 174, 122, 
-  133, 196, 196, 193, 193, 194, 194, 197, 198, 198, 
-  199, 199, 195, 195, 127, 127, 200};
+  97, 97, 97, 98, 101, 101, 104, 104, 106, 105, 
+  105, 105, 105, 105, 105, 105, 105, 108, 103, 102, 
+  111, 111, 113, 113, 114, 114, 110, 112, 112, 112, 
+  112, 112, 112, 112, 120, 120, 120, 121, 121, 122, 
+  122, 112, 112, 112, 112, 112, 112, 112, 112, 112, 
+  112, 112, 112, 112, 112, 112, 112, 109, 109, 109, 
+  109, 125, 125, 125, 125, 125, 125, 125, 125, 125, 
+  125, 125, 125, 125, 125, 125, 125, 125, 125, 115, 
+  127, 127, 127, 127, 126, 126, 129, 129, 131, 131, 
+  131, 131, 131, 131, 132, 132, 132, 132, 132, 132, 
+  132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 
+  132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 
+  132, 132, 132, 132, 132, 133, 133, 107, 107, 107, 
+  107, 107, 136, 136, 137, 137, 137, 137, 135, 135, 
+  138, 138, 139, 139, 140, 140, 140, 141, 141, 141, 
+  141, 141, 141, 141, 141, 141, 141, 142, 142, 142, 
+  142, 143, 143, 143, 144, 144, 144, 144, 145, 145, 
+  145, 145, 145, 145, 145, 146, 146, 146, 146, 146, 
+  146, 147, 147, 147, 147, 147, 148, 148, 148, 148, 
+  148, 149, 149, 150, 150, 151, 151, 152, 152, 153, 
+  153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 
+  158, 159, 159, 160, 160, 130, 130, 161, 161, 162, 
+  162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 
+  162, 100, 100, 163, 163, 164, 164, 165, 165, 99, 
+  99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 
+  99, 99, 99, 99, 116, 177, 177, 176, 176, 124, 
+  124, 178, 178, 179, 179, 181, 181, 180, 182, 185, 
+  183, 183, 186, 184, 184, 117, 118, 118, 119, 119, 
+  166, 166, 166, 166, 166, 166, 166, 167, 167, 167, 
+  167, 168, 168, 168, 168, 169, 169, 170, 172, 187, 
+  187, 190, 190, 188, 188, 191, 189, 171, 171, 171, 
+  173, 173, 174, 174, 174, 192, 193, 175, 175, 123, 
+  134, 197, 197, 194, 194, 195, 195, 198, 199, 199, 
+  200, 200, 196, 196, 128, 128, 201};
 
 const int QmlJSGrammar:: rhs[] = {
   2, 2, 2, 2, 1, 1, 1, 2, 1, 2, 
@@ -205,69 +205,69 @@ const int QmlJSGrammar::goto_default [] = {
   180, 194, 202, 201, 0};
 
 const int QmlJSGrammar::action_index [] = {
-  111, 1025, 2004, -36, 50, 73, -96, 57, -6, -69, 
-  231, -96, 307, 1, -96, -96, 485, 29, 71, 232, 
-  212, -96, -96, -96, 473, 286, 1025, -96, -96, -96, 
-  280, -96, 1820, 1460, 1025, 1025, 1025, -96, 684, 1025, 
-  -96, -96, 1025, 1025, -96, -96, -96, -96, -96, 1025, 
-  -96, 1025, 1025, -96, 1025, 1025, 98, 219, -96, -96, 
-  1025, 1025, 1025, -96, -96, -96, 200, 1025, 255, 1025, 
-  1025, 1025, 1025, 434, 1025, 1025, 1025, 1025, 1025, 1025, 
-  286, 1025, 1025, 1025, 129, 102, 103, 286, 207, 286, 
-  286, 213, 408, 418, 398, 1025, 30, 1025, 63, 1728, 
-  1025, 1025, -96, -96, -96, -96, -96, -96, -96, -96, 
-  -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, 
-  -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, 
-  -96, -96, -96, -96, -96, -96, 114, 1025, -96, -96, 
-  18, -38, -96, 1025, -96, -96, 1025, -96, -96, -96, 
-  -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, 
-  1025, -47, 1025, 1025, 35, 125, 1025, -96, 1728, 1025, 
-  1025, -96, 118, -96, -46, -96, -96, 56, -96, 294, 
-  87, 51, -96, 301, -96, 38, 2096, -96, -96, -96, 
-  -96, -96, 199, -96, -96, 11, -96, -96, -96, -96, 
-  -96, -96, 2096, -96, -96, 348, -96, 507, 97, 2004, 
-  31, 275, 92, 67, 2280, 90, 1025, -96, 79, 64, 
-  1025, 61, -96, 55, 65, -96, -96, 270, -96, -96, 
-  -96, -96, -96, -96, 85, -96, -96, -96, -96, 101, 
-  -96, -96, -96, -96, -96, -96, 43, 49, 1025, 104, 
-  83, -96, -96, 1199, -96, 77, 41, -7, -96, 338, 
-  68, 32, 600, 78, 134, 440, 286, 283, 1025, 260, 
-  1025, 1025, 1025, 1025, 440, 1025, 1025, 1025, 1025, 1025, 
-  286, 286, 286, 286, 286, 341, 356, 362, 1025, -10, 
-  1025, 80, 1025, -96, 503, 1025, -96, 1025, 62, 16, 
-  1025, 14, 2004, -96, 1025, 121, 2004, -96, 1025, 58, 
-  1025, 1025, 82, 81, 1025, -96, 66, 131, 59, -96, 
-  -96, 1025, -96, 251, 1025, -96, -41, 1025, -42, 2004, 
-  -96, 1025, 140, 2004, -96, -17, 227, -37, -8, 2096, 
-  -28, -96, 2004, -96, 1025, 108, 2004, 5, 2004, -96, 
-  -5, -4, -55, -96, -96, 2004, -22, 433, 47, 425, 
-  116, 1025, 2004, 40, 20, 360, 52, 26, 760, 48, 
-  42, -96, 1114, -96, 27, 2, 23, 1025, 22, 6, 
-  1025, 37, 1025, 9, 7, 1025, -96, 1912, 28, -96, 
-  -96, -96, -96, -96, -96, 1025, -96, -96, -96, -96, 
-  228, -96, 1025, -3, -96, 2004, -96, 99, -96, -96, 
-  2004, -96, 1025, 96, -25, -96, 36, -96, 36, 95, 
-  1025, -96, 36, -2, -96, 10, -96, 2004, -96, 107, 
-  2004, -96, 188, -96, -96, 215, 2004, 12, -96, 25, 
-  15, -96, 261, -9, 19, -96, -96, -96, -96, 1025, 
-  123, 2004, -96, 1025, 133, 2004, -96, -1, -96, 144, 
-  -96, -96, 1025, -96, -96, 248, -96, -96, -96, 120, 
-  1372, -96, -96, 1636, -96, -96, 1548, -96, -96, -96, 
-  -96, -96, -96, 127, -96, -96, -96, -96, -96, -96, 
-  -96, -96, -96, 768, -96, 241, 45, 656, -96, -96, 
-  115, 768, 179, 204, -96, 128, -96, 105, -96, -96, 
-  304, -96, -96, 76, -96, -96, -96, 93, -96, 54, 
-  -96, 854, -96, -96, 44, 150, -96, 70, 34, -96, 
-  -96, 940, 100, -96, 153, -96, -96, -96, -26, 168, 
-  -96, 1025, -96, 147, -96, -96, 46, 192, -96, 1025, 
-  -96, 149, -96, -96, 162, 53, 72, 1025, 165, -96, 
-  -96, 161, -96, 169, -96, 60, 13, 230, 166, 254, 
-  -96, 110, -96, -96, -96, -96, -96, 1284, -96, -96, 
-  -96, -96, 274, 2188, 1460, 69, 417, 91, 507, 124, 
-  1025, 2004, 89, -19, 345, 8, -24, 684, 21, 17, 
-  -96, 1114, -96, 4, -30, 0, 1025, 39, 3, 1025, 
-  33, 1025, -23, 24, 367, 109, -96, 578, -96, -96, 
-  -96, -96, 
+  128, 1036, 2026, -39, 49, 73, -97, 54, 10, -69, 
+  243, -97, 285, 1, -97, -97, 503, 29, 75, 246, 
+  202, -97, -97, -97, 477, 288, 1036, -97, -97, -97, 
+  289, -97, 1840, 1476, 1036, 1036, 1036, -97, 691, 1036, 
+  -97, -97, 1036, 1036, -97, -97, -97, -97, -97, 1036, 
+  -97, 1036, 1036, -97, 1036, 1036, 86, 211, -97, -97, 
+  1036, 1036, 1036, -97, -97, -97, 197, 1036, 245, 1036, 
+  1036, 1036, 1036, 438, 1036, 1036, 1036, 1036, 1036, 1036, 
+  288, 1036, 1036, 1036, 133, 129, 132, 288, 288, 288, 
+  288, 288, 410, 420, 386, 1036, -6, 1036, 62, 1747, 
+  1036, 1036, -97, -97, -97, -97, -97, -97, -97, -97, 
+  -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, 
+  -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, 
+  -97, -97, -97, -97, -97, -97, 112, 1036, -97, -97, 
+  18, -38, -97, 1036, -97, -97, 1036, -97, -97, -97, 
+  -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, 
+  1036, -47, 1036, 1036, 35, 34, 1036, -97, 1747, 1036, 
+  1036, -97, 118, -97, -46, -97, -97, 60, -97, 295, 
+  89, 50, -97, 298, -97, 38, 2119, -97, -97, -97, 
+  -97, -97, 205, -97, -97, 14, -97, -97, -97, -97, 
+  -97, -97, 2119, -97, -97, 346, -97, 512, 83, 2026, 
+  30, 280, 100, 70, 2305, 93, 1036, -97, 80, 66, 
+  1036, 65, -97, 59, 67, -97, -97, 276, -97, -97, 
+  -97, -97, -97, -97, 79, -97, -97, -97, -97, 87, 
+  -97, -97, -97, -97, -97, -97, 44, 48, 1036, 106, 
+  76, -97, -97, 1212, -97, 77, 42, -9, -97, 331, 
+  69, 32, 523, 78, 131, 444, 288, 292, 1036, 277, 
+  1036, 1036, 1036, 1036, 444, 1036, 1036, 1036, 1036, 1036, 
+  288, 288, 288, 288, 288, 349, 355, 359, 1036, -12, 
+  1036, 82, 1036, -97, 606, 1036, -97, 1036, 64, 31, 
+  1036, 16, 2026, -97, 1036, 122, 2026, -97, 1036, 57, 
+  1036, 1036, 84, 81, 1036, -97, 68, 135, 63, -97, 
+  -97, 1036, -97, 244, 1036, -97, -41, 1036, -42, 2026, 
+  -97, 1036, 151, 2026, -97, -17, 226, -37, -8, 2119, 
+  -28, -97, 2026, -97, 1036, 110, 2026, 5, 2026, -97, 
+  -5, -4, -55, -97, -97, 2026, -22, 424, 46, 421, 
+  99, 1036, 2026, 40, 20, 369, 52, 26, 768, 47, 
+  41, -97, 1126, -97, 27, 2, 23, 1036, 22, 6, 
+  1036, 127, 1036, 9, 7, 1036, -97, 1933, 28, -97, 
+  -97, -97, -97, -97, -97, 1036, -97, -97, -97, -97, 
+  204, -97, 1036, -3, -97, 2026, -97, 85, -97, -97, 
+  2026, -97, 1036, 103, -25, -97, 37, -97, 37, 98, 
+  1036, -97, 37, -2, -97, 13, -97, 2026, -97, 108, 
+  2026, -97, 189, -97, -97, 130, 2026, 12, -97, 25, 
+  11, -97, 273, -10, 19, -97, -97, -97, -97, 1036, 
+  216, 2026, -97, 1036, 147, 2026, -97, -1, -97, 154, 
+  -97, -97, 1036, -97, -97, 240, -97, -97, -97, 119, 
+  1387, -97, -97, 1654, -97, -97, 1565, -97, -97, -97, 
+  -97, -97, -97, 134, -97, -97, -97, -97, -97, -97, 
+  -97, -97, -97, 776, -97, 223, -11, 663, -97, -97, 
+  120, 776, 176, 163, -97, 117, -97, 90, -97, -97, 
+  303, -97, -97, 61, -97, -97, -97, 97, -97, 58, 
+  -97, 863, -97, -97, 43, 157, -97, 51, 36, -97, 
+  -97, 950, 125, -97, 158, -97, -97, -97, -26, 164, 
+  -97, 1036, -97, 156, -97, -97, 45, 191, -97, 1036, 
+  -97, 180, -97, -97, 160, 53, 74, 1036, 187, -97, 
+  -97, 166, -97, 170, -97, 56, 15, 233, 161, 268, 
+  -97, 95, -97, -97, -97, -97, -97, 1298, -97, -97, 
+  -97, -97, 283, 2212, 1476, 71, 397, 94, 437, 115, 
+  1036, 2026, 92, -19, 364, 8, -24, 691, 21, 17, 
+  -97, 1126, -97, 4, -30, 0, 1036, 39, 3, 1036, 
+  33, 1036, -23, 24, 370, 111, -97, 584, -97, -97, 
+  -97, -97, 
 
   -105, 8, 11, -105, -105, -105, -105, -105, -105, -105, 
   -105, -105, -105, -105, -105, -105, -50, -105, -105, -105, 
@@ -338,97 +338,98 @@ const int QmlJSGrammar::action_info [] = {
   97, -92, 344, 449, 175, -89, 462, 253, 329, 336, 
   327, 348, 145, 338, -93, 339, 143, 341, -111, -116, 
   -114, 160, 440, 399, -92, 395, 436, 160, 412, 436, 
-  -119, 420, 95, 453, -119, 449, -116, -103, 436, -93, 
-  621, 444, 436, 493, -122, -111, 253, 404, 67, -89, 
-  453, 442, 344, 561, 67, 426, 232, 253, 568, 290, 
-  137, 186, 290, 571, 302, 547, 292, 300, 268, 557, 
-  308, 268, 556, 321, 308, 248, 410, 521, 314, 288, 
-  331, 449, 179, 297, 436, 183, -103, 405, -122, 342, 
-  412, 453, 521, 344, 137, 423, 288, 577, 168, 97, 
-  534, 185, 137, 54, 430, 137, 137, 617, 0, 0, 
-  247, 162, 137, 0, 55, 163, 137, 169, 473, 137, 
-  168, 137, 166, 521, 493, 137, 554, 515, 514, 323, 
-  58, 137, 54, 54, 252, 251, 238, 237, 137, 169, 
-  424, 59, 465, 55, 55, 137, 414, 137, 245, 244, 
-  409, 408, 243, 242, 250, 618, 509, 508, 346, 54, 
-  138, 573, 572, 137, 173, 541, 474, 245, 244, 535, 
-  55, 306, 535, 451, 310, 245, 244, 484, 311, 512, 
-  511, 535, 324, 455, 168, 535, 137, 563, 535, 549, 
-  333, 0, 3, 2, 1, 466, 464, 137, 545, 544, 
-  553, 552, 60, 169, 0, 402, 0, 0, 510, 0, 
-  0, 439, 564, 562, 60, 537, 560, 559, 537, 542, 
-  540, 60, 81, 31, 82, 440, 536, 537, 81, 536, 
-  82, 537, 0, 168, 537, 83, 99, 168, 536, 434, 
-  433, 83, 536, 550, 548, 536, 31, 61, 0, 31, 
-  231, 230, 169, 62, 402, 100, 169, 101, 170, 61, 
-  44, 46, 45, 69, 70, 62, 61, 31, 270, 271, 
-  31, 0, 62, 31, 0, 0, 0, 0, 505, 168, 
-  31, 0, 0, 44, 46, 45, 44, 46, 45, 31, 
-  71, 72, 506, 504, 31, 272, 273, -80, 169, 31, 
-  170, 81, 31, 82, 44, 46, 45, 44, 46, 45, 
-  44, 46, 45, 31, 83, 69, 70, 44, 46, 45, 
-  31, 503, 0, 31, 0, 0, 44, 46, 45, 0, 
-  0, 44, 46, 45, 0, 0, 44, 46, 45, 44, 
-  46, 45, 71, 72, 0, 0, 270, 271, 0, 0, 
-  44, 46, 45, 0, 275, 276, 0, 44, 46, 45, 
-  44, 46, 45, 277, 31, 0, 278, 31, 279, 275, 
-  276, -333, 168, 272, 273, 275, 276, 0, 277, 31, 
-  0, 278, 0, 279, 277, 0, -333, 278, 0, 279, 
-  -80, 169, 0, 170, 0, 0, 0, 0, 0, 236, 
-  235, 44, 46, 45, 44, 46, 45, 0, 0, 0, 
-  0, 74, 75, 0, 0, 0, 44, 46, 45, 76, 
-  77, 74, 75, 78, 0, 79, 0, 0, 0, 76, 
-  77, 74, 75, 78, 0, 79, 31, 0, 0, 76, 
-  77, 0, 0, 78, 31, 79, 0, 74, 75, 0, 
-  0, 0, 31, 275, 276, 76, 77, 0, 0, 78, 
-  0, 79, 277, 0, 0, 278, 0, 279, 236, 235, 
-  0, 0, 0, 44, 46, 45, 241, 240, 147, 0, 
-  0, 44, 46, 45, 236, 235, 74, 75, 148, 44, 
-  46, 45, 149, 0, 76, 77, 147, 0, 78, 0, 
-  79, 150, 0, 151, 0, 0, 148, 0, 0, 0, 
-  149, 0, 0, 0, 152, 0, 153, 58, 0, 150, 
-  0, 151, 0, 0, 154, 0, 31, 155, 59, 0, 
-  0, 0, 152, 156, 153, 58, 0, 0, 0, 157, 
-  0, 0, 154, 0, 0, 155, 59, 0, 0, 0, 
-  0, 156, 0, 0, 0, 158, 0, 157, 241, 240, 
-  0, 0, 0, 44, 46, 45, 0, 0, 0, 0, 
-  0, 0, 0, 158, 0, 0, 0, 0, 0, 0, 
-  27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 
-  30, 0, 0, 147, 0, 0, 0, 31, 0, 0, 
-  0, 32, 33, 148, 34, 0, 0, 149, 0, 0, 
-  0, 501, 0, 0, 0, 41, 150, 0, 151, 0, 
-  0, 304, 0, 0, 0, 0, 0, 0, 0, 152, 
-  0, 153, 58, 47, 44, 46, 45, 0, 48, 154, 
-  0, 0, 155, 59, 0, 0, 0, 0, 156, 40, 
-  50, 29, 0, 0, 157, 37, 0, 0, 27, 28, 
-  0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 
-  158, 0, 0, 0, 0, 31, 0, 0, 0, 32, 
-  33, 0, 34, 0, 0, 0, 27, 28, 0, 501, 
-  0, 0, 0, 41, 0, 0, 30, 0, 0, 0, 
-  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
-  34, 47, 44, 46, 45, 0, 48, 38, 0, 0, 
-  0, 41, 0, 0, 0, 0, 0, 40, 50, 29, 
-  0, 0, 0, 37, 0, 0, 0, 0, 0, 47, 
-  44, 46, 45, 0, 48, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 40, 50, 29, 0, 0, 
-  0, 37, 27, 28, 0, 0, 0, 0, 0, 0, 
-  27, 28, 30, 0, 0, 0, 0, 0, 0, 31, 
-  30, 0, 0, 32, 33, 0, 34, 31, 0, 0, 
-  0, 32, 33, 38, 34, 0, 0, 41, 0, 0, 
-  0, 501, 0, 0, 0, 41, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 47, 44, 46, 45, 0, 
-  48, 0, 0, 47, 44, 46, 45, 0, 48, 0, 
-  0, 40, 50, 29, 0, 0, 0, 37, 0, 40, 
-  50, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
-  0, 0, 0, 0, 524, 0, 27, 28, 0, 0, 
-  0, 0, 0, 0, 0, 0, 211, 0, 0, 0, 
-  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
-  34, 0, 0, 0, 0, 0, 0, 501, 0, 0, 
-  0, 41, 0, 0, 0, 0, 0, 0, 0, 526, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 
-  525, 528, 527, 0, 48, 0, 0, 0, 0, 222, 
-  0, 0, 0, 0, 0, 40, 50, 29, 206, 0, 
-  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
+  -119, 166, 420, 453, 436, 449, -116, -103, -93, 621, 
+  444, 493, 436, -122, -111, 67, 253, 404, 95, -89, 
+  453, 442, 344, 67, 568, 561, 253, 290, 426, 232, 
+  290, 186, 137, 97, 547, 571, 302, 292, 268, 493, 
+  308, 557, 556, 268, 248, 321, 308, 410, 314, 0, 
+  288, 521, 300, 297, 331, 449, 179, 183, 436, -103, 
+  405, -122, 412, 453, 521, 288, 344, 342, 423, 534, 
+  185, 137, 168, 54, 137, 430, 137, 554, 137, 617, 
+  137, 247, 515, 514, 55, 162, 137, 473, 58, 163, 
+  137, 169, 577, 0, -119, 168, 439, 252, 251, 59, 
+  238, 237, 137, 323, 245, 244, 409, 408, 243, 242, 
+  440, 509, 508, 424, 169, 137, 573, 572, 521, 137, 
+  245, 244, 465, 414, 137, 0, 250, 618, 138, 54, 
+  346, 541, 54, 54, 173, 474, 245, 244, 512, 511, 
+  55, 310, 306, 55, 55, 311, 535, 535, 137, 535, 
+  535, 168, 31, 0, 484, 137, 324, 137, 549, 535, 
+  0, 0, 563, 0, 0, 0, 0, 455, 510, 60, 
+  169, 333, 402, 137, 60, 466, 464, 545, 544, 168, 
+  3, 2, 1, 60, 137, 542, 540, 564, 562, 44, 
+  46, 45, 537, 537, 0, 537, 537, 0, 169, 0, 
+  402, 553, 552, 536, 536, 537, 536, 536, 560, 559, 
+  434, 433, 550, 548, 61, 31, 536, 0, 99, 61, 
+  62, 168, 31, 69, 70, 62, 231, 230, 61, 31, 
+  505, 0, 0, 31, 62, 0, 451, 100, 0, 101, 
+  169, 0, 170, 0, 506, 504, 0, 0, 0, 0, 
+  71, 72, 44, 46, 45, 270, 271, 31, 168, 44, 
+  46, 45, 31, 69, 70, 31, 44, 46, 45, 31, 
+  44, 46, 45, 81, 503, 82, -80, 169, 31, 170, 
+  0, 31, 272, 273, 31, 0, 83, 31, 0, 0, 
+  71, 72, 31, 0, 44, 46, 45, 0, 0, 44, 
+  46, 45, 44, 46, 45, 0, 44, 46, 45, 270, 
+  271, 0, 0, 0, 0, 44, 46, 45, 44, 46, 
+  45, 44, 46, 45, 44, 46, 45, 0, 0, 44, 
+  46, 45, 275, 276, 0, 31, 272, 273, 275, 276, 
+  0, 277, 275, 276, 278, 168, 279, 277, 0, 0, 
+  278, 277, 279, 31, 278, 0, 279, 0, 31, 0, 
+  -333, 0, 0, -80, 169, -333, 170, 236, 235, 74, 
+  75, 0, 44, 46, 45, 0, 0, 76, 77, 0, 
+  0, 78, 0, 79, 0, 0, 31, 0, 0, 0, 
+  44, 46, 45, 74, 75, 44, 46, 45, 0, 0, 
+  0, 76, 77, 74, 75, 78, 0, 79, 0, 0, 
+  31, 76, 77, 31, 0, 78, 0, 79, 236, 235, 
+  0, 74, 75, 44, 46, 45, 31, 275, 276, 76, 
+  77, 0, 0, 78, 0, 79, 277, 0, 0, 278, 
+  0, 279, 241, 240, 0, 236, 235, 44, 46, 45, 
+  44, 46, 45, 0, 0, 0, 0, 0, 241, 240, 
+  74, 75, 0, 44, 46, 45, 147, 0, 76, 77, 
+  0, 0, 78, 0, 79, 0, 148, 0, 0, 0, 
+  149, 0, 0, 0, 0, 0, 147, 0, 0, 150, 
+  0, 151, 0, 0, 0, 0, 148, 0, 0, 0, 
+  149, 31, 152, 0, 153, 58, 0, 0, 0, 150, 
+  0, 151, 154, 0, 304, 155, 59, 0, 0, 0, 
+  0, 156, 152, 0, 153, 58, 0, 157, 0, 0, 
+  0, 0, 154, 241, 240, 155, 59, 0, 44, 46, 
+  45, 156, 0, 158, 0, 0, 0, 157, 0, 0, 
+  0, 0, 0, 0, 0, 0, 27, 28, 0, 0, 
+  0, 0, 0, 158, 0, 0, 30, 0, 0, 147, 
+  0, 0, 0, 31, 0, 0, 0, 32, 33, 148, 
+  34, 0, 0, 149, 0, 0, 0, 501, 0, 0, 
+  0, 41, 150, 0, 151, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 152, 0, 153, 58, 47, 
+  44, 46, 45, 0, 48, 154, 0, 0, 155, 59, 
+  0, 0, 0, 0, 156, 40, 50, 29, 0, 0, 
+  157, 37, 0, 0, 0, 27, 28, 0, 0, 0, 
+  0, 0, 0, 0, 0, 30, 158, 0, 0, 0, 
+  0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 
+  0, 0, 0, 27, 28, 0, 501, 0, 0, 0, 
+  41, 0, 0, 30, 0, 0, 0, 0, 0, 0, 
+  31, 0, 0, 0, 32, 33, 0, 34, 47, 44, 
+  46, 45, 0, 48, 38, 0, 0, 0, 41, 0, 
+  0, 0, 0, 0, 40, 50, 29, 0, 0, 0, 
+  37, 0, 0, 0, 0, 0, 47, 44, 46, 45, 
+  0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 40, 50, 29, 0, 0, 0, 37, 0, 
+  27, 28, 0, 0, 0, 0, 0, 0, 27, 28, 
+  30, 0, 0, 0, 0, 0, 0, 31, 30, 0, 
+  0, 32, 33, 0, 34, 31, 0, 0, 0, 32, 
+  33, 38, 34, 0, 0, 41, 0, 0, 0, 501, 
+  0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 47, 44, 46, 45, 0, 48, 0, 
+  0, 47, 44, 46, 45, 0, 48, 0, 0, 40, 
+  50, 29, 0, 0, 0, 37, 0, 40, 50, 29, 
+  0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 524, 0, 27, 28, 0, 0, 0, 
+  0, 0, 0, 0, 0, 211, 0, 0, 0, 0, 
+  0, 0, 31, 0, 0, 0, 32, 33, 0, 34, 
+  0, 0, 0, 0, 0, 0, 501, 0, 0, 0, 
+  41, 0, 0, 0, 0, 0, 0, 0, 526, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 47, 525, 
+  528, 527, 0, 48, 0, 0, 0, 0, 222, 0, 
+  0, 0, 0, 0, 40, 50, 29, 206, 0, 0, 
+  37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   524, 0, 27, 28, 0, 0, 0, 0, 0, 0, 
   0, 0, 211, 0, 0, 0, 0, 0, 0, 31, 
   0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 
@@ -437,85 +438,86 @@ const int QmlJSGrammar::action_info [] = {
   0, 0, 0, 0, 0, 47, 525, 528, 527, 0, 
   48, 0, 0, 0, 0, 222, 0, 0, 0, 0, 
   0, 40, 50, 29, 206, 0, 0, 37, 0, 0, 
-  0, 0, 0, 0, 0, 0, 26, 27, 28, 0, 
-  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
-  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
-  0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 
-  0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 
+  0, 0, 0, 0, 0, 0, 0, 26, 27, 28, 
+  0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 
+  0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 
+  33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 
+  39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  47, 44, 46, 45, 0, 48, 0, 49, 0, 51, 
-  0, 52, 0, 0, 0, 0, 40, 50, 29, 0, 
-  0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 
-  0, -112, 0, 0, 0, 26, 27, 28, 0, 0, 
-  0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
-  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
-  34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
-  0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 
-  44, 46, 45, 0, 48, 0, 49, 0, 51, 0, 
-  52, 0, 0, 0, 0, 40, 50, 29, 0, 0, 
-  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
-  26, 27, 28, 0, 0, 0, 0, 0, 0, 0, 
-  0, 30, 0, 0, 0, 0, 0, 0, 31, 0, 
-  0, 0, 32, 33, 0, 34, 0, 0, 0, 35, 
-  0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 
-  42, 0, 43, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 47, 44, 46, 45, 0, 48, 
-  0, 49, 0, 51, 267, 52, 0, 0, 0, 0, 
-  40, 50, 29, 0, 0, 0, 37, 0, 0, 0, 
-  0, 0, 0, 0, 0, 26, 27, 28, 0, 0, 
-  0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
-  0, 0, 0, 31, 213, 0, 0, 583, 584, 0, 
-  34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
-  0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
-  0, 0, 0, 0, 0, 217, 0, 0, 0, 47, 
-  44, 46, 45, 0, 48, 0, 49, 0, 51, 0, 
-  52, 0, 0, 0, 0, 40, 50, 29, 0, 0, 
-  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
-  479, 0, 0, 26, 27, 28, 0, 0, 0, 0, 
+  0, 47, 44, 46, 45, 0, 48, 0, 49, 0, 
+  51, 0, 52, 0, 0, 0, 0, 40, 50, 29, 
+  0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, -112, 0, 0, 0, 26, 27, 28, 
+  0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 
+  0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 
+  33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 
+  39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 47, 44, 46, 45, 0, 48, 0, 49, 0, 
+  51, 0, 52, 0, 0, 0, 0, 40, 50, 29, 
+  0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 26, 27, 28, 0, 0, 0, 0, 
   0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 
   0, 31, 0, 0, 0, 32, 33, 0, 34, 0, 
   0, 0, 35, 0, 36, 38, 39, 0, 0, 41, 
-  0, 0, 0, 42, 0, 43, 0, 0, 482, 0, 
+  0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 47, 44, 46, 
-  45, 0, 48, 0, 49, 0, 51, 0, 52, 0, 
+  45, 0, 48, 0, 49, 0, 51, 267, 52, 0, 
   0, 0, 0, 40, 50, 29, 0, 0, 0, 37, 
-  0, 0, 0, 0, 0, 0, 0, 0, 471, 0, 
-  0, 26, 27, 28, 0, 0, 0, 0, 0, 0, 
-  0, 0, 30, 0, 0, 0, 0, 0, 0, 31, 
-  0, 0, 0, 32, 33, 0, 34, 0, 0, 0, 
-  35, 0, 36, 38, 39, 0, 0, 41, 0, 0, 
-  0, 42, 0, 43, 0, 0, 472, 0, 0, 0, 
-  0, 0, 0, 0, 0, 47, 44, 46, 45, 0, 
-  48, 0, 49, 0, 51, 0, 52, 0, 0, 0, 
-  0, 40, 50, 29, 0, 0, 0, 37, 0, 0, 
-  0, 0, 0, 0, 0, 0, 479, 0, 0, 26, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 
   27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 
-  30, 0, 0, 0, 0, 0, 0, 31, 0, 0, 
-  0, 32, 33, 0, 34, 0, 0, 0, 35, 0, 
+  30, 0, 0, 0, 0, 0, 0, 31, 213, 0, 
+  0, 583, 584, 0, 34, 0, 0, 0, 35, 0, 
   36, 38, 39, 0, 0, 41, 0, 0, 0, 42, 
-  0, 43, 0, 0, 480, 0, 0, 0, 0, 0, 
+  0, 43, 0, 0, 0, 0, 0, 0, 0, 217, 
   0, 0, 0, 47, 44, 46, 45, 0, 48, 0, 
   49, 0, 51, 0, 52, 0, 0, 0, 0, 40, 
   50, 29, 0, 0, 0, 37, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 479, 0, 0, 26, 27, 
+  28, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
+  0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 
+  32, 33, 0, 34, 0, 0, 0, 35, 0, 36, 
+  38, 39, 0, 0, 41, 0, 0, 0, 42, 0, 
+  43, 0, 0, 482, 0, 0, 0, 0, 0, 0, 
+  0, 0, 47, 44, 46, 45, 0, 48, 0, 49, 
+  0, 51, 0, 52, 0, 0, 0, 0, 40, 50, 
+  29, 0, 0, 0, 37, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 471, 0, 0, 26, 27, 28, 
   0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 
   0, 0, 0, 0, 0, 31, 0, 0, 0, 32, 
   33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 
   39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 
-  0, 0, 477, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 472, 0, 0, 0, 0, 0, 0, 0, 
   0, 47, 44, 46, 45, 0, 48, 0, 49, 0, 
   51, 0, 52, 0, 0, 0, 0, 40, 50, 29, 
   0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 
-  0, 0, 105, 106, 107, 0, 0, 109, 111, 112, 
-  0, 0, 113, 0, 114, 0, 0, 0, 116, 117, 
-  118, 0, 0, 0, 0, 0, 0, 31, 119, 120, 
-  121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 125, 0, 0, 
-  0, 0, 0, 0, 44, 46, 45, 126, 127, 128, 
-  0, 130, 131, 132, 133, 134, 135, 0, 0, 123, 
-  129, 115, 108, 110, 124, 0, 0, 0, 0, 0, 
+  0, 0, 0, 479, 0, 0, 26, 27, 28, 0, 
+  0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 
+  0, 0, 0, 0, 31, 0, 0, 0, 32, 33, 
+  0, 34, 0, 0, 0, 35, 0, 36, 38, 39, 
+  0, 0, 41, 0, 0, 0, 42, 0, 43, 0, 
+  0, 480, 0, 0, 0, 0, 0, 0, 0, 0, 
+  47, 44, 46, 45, 0, 48, 0, 49, 0, 51, 
+  0, 52, 0, 0, 0, 0, 40, 50, 29, 0, 
+  0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 471, 0, 0, 26, 27, 28, 0, 0, 
+  0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 
+  0, 0, 0, 31, 0, 0, 0, 32, 33, 0, 
+  34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
+  0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
+  477, 0, 0, 0, 0, 0, 0, 0, 0, 47, 
+  44, 46, 45, 0, 48, 0, 49, 0, 51, 0, 
+  52, 0, 0, 0, 0, 40, 50, 29, 0, 0, 
+  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 105, 106, 107, 0, 0, 109, 111, 112, 0, 
+  0, 113, 0, 114, 0, 0, 0, 116, 117, 118, 
+  0, 0, 0, 0, 0, 0, 31, 119, 120, 121, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 125, 0, 0, 0, 
+  0, 0, 0, 44, 46, 45, 126, 127, 128, 0, 
+  130, 131, 132, 133, 134, 135, 0, 0, 123, 129, 
+  115, 108, 110, 124, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 105, 106, 107, 0, 0, 109, 
   111, 112, 0, 0, 113, 0, 114, 0, 0, 0, 
   116, 117, 118, 0, 0, 0, 0, 0, 0, 389, 
@@ -525,27 +527,18 @@ const int QmlJSGrammar::action_info [] = {
   0, 0, 0, 0, 0, 394, 391, 393, 0, 126, 
   127, 128, 0, 130, 131, 132, 133, 134, 135, 0, 
   0, 123, 129, 115, 108, 110, 124, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 105, 106, 107, 0, 
-  0, 109, 111, 112, 0, 0, 113, 0, 114, 0, 
-  0, 0, 116, 117, 118, 0, 0, 0, 0, 0, 
-  0, 389, 119, 120, 121, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 122, 0, 0, 0, 390, 
-  0, 0, 0, 0, 0, 0, 0, 392, 0, 0, 
-  0, 125, 0, 0, 0, 0, 0, 394, 391, 393, 
-  0, 126, 127, 128, 0, 130, 131, 132, 133, 134, 
-  135, 0, 0, 123, 129, 115, 108, 110, 124, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 205, 0, 
-  0, 0, 0, 207, 0, 26, 27, 28, 209, 0, 
-  0, 0, 0, 0, 0, 210, 30, 0, 0, 0, 
-  0, 0, 0, 212, 213, 0, 0, 214, 33, 0, 
-  34, 0, 0, 0, 35, 0, 36, 38, 39, 0, 
-  0, 41, 0, 0, 0, 42, 0, 43, 0, 0, 
-  0, 0, 0, 216, 0, 217, 0, 0, 0, 47, 
-  215, 218, 45, 219, 48, 220, 49, 221, 51, 222, 
-  52, 223, 224, 0, 0, 40, 50, 29, 206, 208, 
-  0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 105, 106, 107, 
+  0, 0, 109, 111, 112, 0, 0, 113, 0, 114, 
+  0, 0, 0, 116, 117, 118, 0, 0, 0, 0, 
+  0, 0, 389, 119, 120, 121, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 122, 0, 0, 0, 
+  390, 0, 0, 0, 0, 0, 0, 0, 392, 0, 
+  0, 0, 125, 0, 0, 0, 0, 0, 394, 391, 
+  393, 0, 126, 127, 128, 0, 130, 131, 132, 133, 
+  134, 135, 0, 0, 123, 129, 115, 108, 110, 124, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   205, 0, 0, 0, 0, 207, 0, 26, 27, 28, 
-  209, 0, 0, 0, 0, 0, 0, 210, 211, 0, 
+  209, 0, 0, 0, 0, 0, 0, 210, 30, 0, 
   0, 0, 0, 0, 0, 212, 213, 0, 0, 214, 
   33, 0, 34, 0, 0, 0, 35, 0, 36, 38, 
   39, 0, 0, 41, 0, 0, 0, 42, 0, 43, 
@@ -553,25 +546,35 @@ const int QmlJSGrammar::action_info [] = {
   0, 47, 215, 218, 45, 219, 48, 220, 49, 221, 
   51, 222, 52, 223, 224, 0, 0, 40, 50, 29, 
   206, 208, 0, 37, 0, 0, 0, 0, 0, 0, 
-  0, 0, 586, 106, 107, 0, 0, 588, 111, 590, 
-  27, 28, 591, 0, 114, 0, 0, 0, 116, 593, 
-  594, 0, 0, 0, 0, 0, 0, 595, 596, 120, 
-  121, 214, 33, 0, 34, 0, 0, 0, 35, 0, 
-  36, 597, 39, 0, 0, 599, 0, 0, 0, 42, 
-  0, 43, 0, 0, 0, 0, 0, 601, 0, 217, 
-  0, 0, 0, 603, 600, 602, 45, 604, 605, 606, 
-  49, 608, 609, 610, 611, 612, 613, 0, 0, 598, 
-  607, 592, 587, 589, 124, 37, 0, 0, 0, 0, 
-  0, 0, 0, 0, 357, 106, 107, 0, 0, 359, 
-  111, 361, 27, 28, 362, 0, 114, 0, 0, 0, 
-  116, 364, 365, 0, 0, 0, 0, 0, 0, 366, 
-  367, 120, 121, 214, 33, 0, 34, 0, 0, 0, 
-  35, 0, 36, 368, 39, 0, 0, 370, 0, 0, 
-  0, 42, 0, 43, 0, -258, 0, 0, 0, 372, 
-  0, 217, 0, 0, 0, 374, 371, 373, 45, 375, 
-  376, 377, 49, 379, 380, 381, 382, 383, 384, 0, 
-  0, 369, 378, 363, 358, 360, 124, 37, 0, 0, 
-  0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 205, 0, 0, 0, 0, 207, 0, 
+  26, 27, 28, 209, 0, 0, 0, 0, 0, 0, 
+  210, 211, 0, 0, 0, 0, 0, 0, 212, 213, 
+  0, 0, 214, 33, 0, 34, 0, 0, 0, 35, 
+  0, 36, 38, 39, 0, 0, 41, 0, 0, 0, 
+  42, 0, 43, 0, 0, 0, 0, 0, 216, 0, 
+  217, 0, 0, 0, 47, 215, 218, 45, 219, 48, 
+  220, 49, 221, 51, 222, 52, 223, 224, 0, 0, 
+  40, 50, 29, 206, 208, 0, 37, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 586, 106, 107, 0, 
+  0, 588, 111, 590, 27, 28, 591, 0, 114, 0, 
+  0, 0, 116, 593, 594, 0, 0, 0, 0, 0, 
+  0, 595, 596, 120, 121, 214, 33, 0, 34, 0, 
+  0, 0, 35, 0, 36, 597, 39, 0, 0, 599, 
+  0, 0, 0, 42, 0, 43, 0, 0, 0, 0, 
+  0, 601, 0, 217, 0, 0, 0, 603, 600, 602, 
+  45, 604, 605, 606, 49, 608, 609, 610, 611, 612, 
+  613, 0, 0, 598, 607, 592, 587, 589, 124, 37, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 357, 
+  106, 107, 0, 0, 359, 111, 361, 27, 28, 362, 
+  0, 114, 0, 0, 0, 116, 364, 365, 0, 0, 
+  0, 0, 0, 0, 366, 367, 120, 121, 214, 33, 
+  0, 34, 0, 0, 0, 35, 0, 36, 368, 39, 
+  0, 0, 370, 0, 0, 0, 42, 0, 43, 0, 
+  -258, 0, 0, 0, 372, 0, 217, 0, 0, 0, 
+  374, 371, 373, 45, 375, 376, 377, 49, 379, 380, 
+  381, 382, 383, 384, 0, 0, 369, 378, 363, 358, 
+  360, 124, 37, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 
 
   386, 538, 182, 555, 543, 406, 203, 165, 551, 303, 
   388, 13, 502, 491, 396, 146, 298, 307, 507, 305, 
@@ -624,97 +627,98 @@ const int QmlJSGrammar::action_check [] = {
   79, 7, 36, 36, 60, 7, 17, 36, 60, 36, 
   61, 16, 60, 60, 7, 33, 8, 55, 7, 7, 
   7, 2, 20, 55, 7, 7, 33, 2, 36, 33, 
-  7, 5, 48, 36, 7, 36, 7, 7, 33, 7, 
-  0, 60, 33, 89, 7, 7, 36, 60, 1, 7, 
-  36, 36, 36, 29, 1, 55, 55, 36, 8, 79, 
-  8, 33, 79, 60, 60, 29, 8, 61, 1, 7, 
-  2, 1, 29, 17, 2, 36, 7, 33, 7, 48, 
-  31, 36, 36, 61, 33, 8, 7, 7, 7, 7, 
-  36, 36, 33, 36, 8, 10, 48, 7, 15, 79, 
-  66, 60, 8, 40, 7, 8, 8, 8, -1, -1, 
-  77, 50, 8, -1, 51, 54, 8, 34, 8, 8, 
-  15, 8, 7, 33, 89, 8, 66, 61, 62, 8, 
-  42, 8, 40, 40, 61, 62, 61, 62, 8, 34, 
-  55, 53, 8, 51, 51, 8, 60, 8, 61, 62, 
-  61, 62, 61, 62, 60, 56, 61, 62, 60, 40, 
-  56, 61, 62, 8, 56, 7, 56, 61, 62, 29, 
-  51, 60, 29, 60, 50, 61, 62, 60, 54, 61, 
-  62, 29, 61, 60, 15, 29, 8, 36, 29, 7, 
-  60, -1, 91, 92, 93, 61, 62, 8, 61, 62, 
-  61, 62, 12, 34, -1, 36, -1, -1, 90, -1, 
-  -1, 6, 61, 62, 12, 75, 61, 62, 75, 61, 
-  62, 12, 25, 29, 27, 20, 86, 75, 25, 86, 
-  27, 75, -1, 15, 75, 38, 15, 15, 86, 61, 
-  62, 38, 86, 61, 62, 86, 29, 57, -1, 29, 
-  61, 62, 34, 63, 36, 34, 34, 36, 36, 57, 
-  66, 67, 68, 18, 19, 63, 57, 29, 18, 19, 
-  29, -1, 63, 29, -1, -1, -1, -1, 47, 15, 
-  29, -1, -1, 66, 67, 68, 66, 67, 68, 29, 
-  45, 46, 61, 62, 29, 45, 46, 33, 34, 29, 
-  36, 25, 29, 27, 66, 67, 68, 66, 67, 68, 
-  66, 67, 68, 29, 38, 18, 19, 66, 67, 68, 
-  29, 90, -1, 29, -1, -1, 66, 67, 68, -1, 
-  -1, 66, 67, 68, -1, -1, 66, 67, 68, 66, 
-  67, 68, 45, 46, -1, -1, 18, 19, -1, -1, 
-  66, 67, 68, -1, 23, 24, -1, 66, 67, 68, 
-  66, 67, 68, 32, 29, -1, 35, 29, 37, 23, 
-  24, 36, 15, 45, 46, 23, 24, -1, 32, 29, 
-  -1, 35, -1, 37, 32, -1, 36, 35, -1, 37, 
-  33, 34, -1, 36, -1, -1, -1, -1, -1, 61, 
-  62, 66, 67, 68, 66, 67, 68, -1, -1, -1, 
-  -1, 23, 24, -1, -1, -1, 66, 67, 68, 31, 
-  32, 23, 24, 35, -1, 37, -1, -1, -1, 31, 
-  32, 23, 24, 35, -1, 37, 29, -1, -1, 31, 
-  32, -1, -1, 35, 29, 37, -1, 23, 24, -1, 
-  -1, -1, 29, 23, 24, 31, 32, -1, -1, 35, 
-  -1, 37, 32, -1, -1, 35, -1, 37, 61, 62, 
-  -1, -1, -1, 66, 67, 68, 61, 62, 3, -1, 
-  -1, 66, 67, 68, 61, 62, 23, 24, 13, 66, 
-  67, 68, 17, -1, 31, 32, 3, -1, 35, -1, 
-  37, 26, -1, 28, -1, -1, 13, -1, -1, -1, 
-  17, -1, -1, -1, 39, -1, 41, 42, -1, 26, 
-  -1, 28, -1, -1, 49, -1, 29, 52, 53, -1, 
-  -1, -1, 39, 58, 41, 42, -1, -1, -1, 64, 
-  -1, -1, 49, -1, -1, 52, 53, -1, -1, -1, 
-  -1, 58, -1, -1, -1, 80, -1, 64, 61, 62, 
-  -1, -1, -1, 66, 67, 68, -1, -1, -1, -1, 
-  -1, -1, -1, 80, -1, -1, -1, -1, -1, -1, 
-  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, 3, -1, -1, -1, 29, -1, -1, 
-  -1, 33, 34, 13, 36, -1, -1, 17, -1, -1, 
-  -1, 43, -1, -1, -1, 47, 26, -1, 28, -1, 
-  -1, 31, -1, -1, -1, -1, -1, -1, -1, 39, 
-  -1, 41, 42, 65, 66, 67, 68, -1, 70, 49, 
-  -1, -1, 52, 53, -1, -1, -1, -1, 58, 81, 
-  82, 83, -1, -1, 64, 87, -1, -1, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  80, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, 12, 13, -1, 43, 
-  -1, -1, -1, 47, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, 65, 66, 67, 68, -1, 70, 43, -1, -1, 
-  -1, 47, -1, -1, -1, -1, -1, 81, 82, 83, 
-  -1, -1, -1, 87, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, 12, 13, -1, -1, -1, -1, -1, -1, 
-  12, 13, 22, -1, -1, -1, -1, -1, -1, 29, 
-  22, -1, -1, 33, 34, -1, 36, 29, -1, -1, 
-  -1, 33, 34, 43, 36, -1, -1, 47, -1, -1, 
-  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, 81, 
-  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 10, -1, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
-  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, -1, -1, -1, 75, 
-  -1, -1, -1, -1, -1, 81, 82, 83, 84, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
+  7, 7, 5, 36, 33, 36, 7, 7, 7, 0, 
+  60, 90, 33, 7, 7, 1, 36, 60, 48, 7, 
+  36, 36, 36, 1, 8, 29, 36, 79, 55, 55, 
+  79, 33, 8, 79, 29, 60, 60, 8, 1, 90, 
+  2, 7, 29, 1, 36, 17, 2, 7, 7, -1, 
+  48, 33, 61, 61, 31, 36, 36, 8, 33, 7, 
+  7, 7, 36, 36, 33, 48, 36, 7, 10, 66, 
+  60, 8, 15, 40, 8, 7, 8, 66, 8, 8, 
+  8, 77, 61, 62, 51, 50, 8, 8, 42, 54, 
+  8, 34, 7, -1, 7, 15, 6, 61, 62, 53, 
+  61, 62, 8, 8, 61, 62, 61, 62, 61, 62, 
+  20, 61, 62, 55, 34, 8, 61, 62, 33, 8, 
+  61, 62, 8, 60, 8, -1, 60, 56, 56, 40, 
+  60, 7, 40, 40, 56, 56, 61, 62, 61, 62, 
+  51, 50, 60, 51, 51, 54, 29, 29, 8, 29, 
+  29, 15, 29, -1, 60, 8, 61, 8, 7, 29, 
+  -1, -1, 36, -1, -1, -1, -1, 60, 91, 12, 
+  34, 60, 36, 8, 12, 61, 62, 61, 62, 15, 
+  92, 93, 94, 12, 8, 61, 62, 61, 62, 66, 
+  67, 68, 75, 75, -1, 75, 75, -1, 34, -1, 
+  36, 61, 62, 86, 86, 75, 86, 86, 61, 62, 
+  61, 62, 61, 62, 57, 29, 86, -1, 15, 57, 
+  63, 15, 29, 18, 19, 63, 61, 62, 57, 29, 
+  47, -1, -1, 29, 63, -1, 60, 34, -1, 36, 
+  34, -1, 36, -1, 61, 62, -1, -1, -1, -1, 
+  45, 46, 66, 67, 68, 18, 19, 29, 15, 66, 
+  67, 68, 29, 18, 19, 29, 66, 67, 68, 29, 
+  66, 67, 68, 25, 91, 27, 33, 34, 29, 36, 
+  -1, 29, 45, 46, 29, -1, 38, 29, -1, -1, 
+  45, 46, 29, -1, 66, 67, 68, -1, -1, 66, 
+  67, 68, 66, 67, 68, -1, 66, 67, 68, 18, 
+  19, -1, -1, -1, -1, 66, 67, 68, 66, 67, 
+  68, 66, 67, 68, 66, 67, 68, -1, -1, 66, 
+  67, 68, 23, 24, -1, 29, 45, 46, 23, 24, 
+  -1, 32, 23, 24, 35, 15, 37, 32, -1, -1, 
+  35, 32, 37, 29, 35, -1, 37, -1, 29, -1, 
+  36, -1, -1, 33, 34, 36, 36, 61, 62, 23, 
+  24, -1, 66, 67, 68, -1, -1, 31, 32, -1, 
+  -1, 35, -1, 37, -1, -1, 29, -1, -1, -1, 
+  66, 67, 68, 23, 24, 66, 67, 68, -1, -1, 
+  -1, 31, 32, 23, 24, 35, -1, 37, -1, -1, 
+  29, 31, 32, 29, -1, 35, -1, 37, 61, 62, 
+  -1, 23, 24, 66, 67, 68, 29, 23, 24, 31, 
+  32, -1, -1, 35, -1, 37, 32, -1, -1, 35, 
+  -1, 37, 61, 62, -1, 61, 62, 66, 67, 68, 
+  66, 67, 68, -1, -1, -1, -1, -1, 61, 62, 
+  23, 24, -1, 66, 67, 68, 3, -1, 31, 32, 
+  -1, -1, 35, -1, 37, -1, 13, -1, -1, -1, 
+  17, -1, -1, -1, -1, -1, 3, -1, -1, 26, 
+  -1, 28, -1, -1, -1, -1, 13, -1, -1, -1, 
+  17, 29, 39, -1, 41, 42, -1, -1, -1, 26, 
+  -1, 28, 49, -1, 31, 52, 53, -1, -1, -1, 
+  -1, 58, 39, -1, 41, 42, -1, 64, -1, -1, 
+  -1, -1, 49, 61, 62, 52, 53, -1, 66, 67, 
+  68, 58, -1, 80, -1, -1, -1, 64, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 12, 13, -1, -1, 
+  -1, -1, -1, 80, -1, -1, 22, -1, -1, 3, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, 13, 
+  36, -1, -1, 17, -1, -1, -1, 43, -1, -1, 
+  -1, 47, 26, -1, 28, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 39, -1, 41, 42, 65, 
+  66, 67, 68, -1, 70, 49, -1, -1, 52, 53, 
+  -1, -1, -1, -1, 58, 81, 82, 83, -1, -1, 
+  64, 87, -1, -1, -1, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 22, 80, -1, -1, -1, 
+  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, 12, 13, -1, 43, -1, -1, -1, 
+  47, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
+  29, -1, -1, -1, 33, 34, -1, 36, 65, 66, 
+  67, 68, -1, 70, 43, -1, -1, -1, 47, -1, 
+  -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
+  87, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  12, 13, -1, -1, -1, -1, -1, -1, 12, 13, 
+  22, -1, -1, -1, -1, -1, -1, 29, 22, -1, 
+  -1, 33, 34, -1, 36, 29, -1, -1, -1, 33, 
+  34, 43, 36, -1, -1, 47, -1, -1, -1, 43, 
+  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 10, -1, 12, 13, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
+  -1, -1, 29, -1, -1, -1, 33, 34, -1, 36, 
+  -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, 
+  47, -1, -1, -1, -1, -1, -1, -1, 55, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, 
+  67, 68, -1, 70, -1, -1, -1, -1, 75, -1, 
+  -1, -1, -1, -1, 81, 82, 83, 84, -1, -1, 
+  87, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   10, -1, 12, 13, -1, -1, -1, -1, -1, -1, 
   -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
   -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
@@ -723,67 +727,50 @@ const int QmlJSGrammar::action_check [] = {
   -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
   70, -1, -1, -1, -1, 75, -1, -1, -1, -1, 
   -1, 81, 82, 83, 84, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 11, 12, 13, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
-  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
-  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
-  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
-  -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 7, -1, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
-  11, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
-  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
-  51, -1, 53, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
-  -1, 72, -1, 74, 75, 76, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
-  -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  -1, -1, -1, -1, -1, 61, -1, -1, -1, 65, 
-  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
-  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
-  8, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
+  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 7, -1, -1, -1, 11, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
+  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
+  -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
   -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
   -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
   -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, 56, -1, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
+  68, -1, 70, -1, 72, -1, 74, 75, 76, -1, 
   -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
-  -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
-  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
   12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
   -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
   42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
+  -1, 53, -1, -1, -1, -1, -1, -1, -1, 61, 
   -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
   72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
   82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
+  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
+  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
+  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 8, -1, -1, 11, 12, 13, 
   -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
   -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
@@ -793,15 +780,33 @@ const int QmlJSGrammar::action_check [] = {
   -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
   74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
   -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
-  -1, -1, -1, -1, 66, 67, 68, 69, 70, 71, 
-  -1, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
-  82, 83, 84, 85, 86, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
+  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 
+  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
+  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
+  -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 4, 5, 6, -1, -1, 9, 10, 11, -1, 
+  -1, 14, -1, 16, -1, -1, -1, 20, 21, 22, 
+  -1, -1, -1, -1, -1, -1, 29, 30, 31, 32, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  43, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 59, -1, -1, -1, 
+  -1, -1, -1, 66, 67, 68, 69, 70, 71, -1, 
+  73, 74, 75, 76, 77, 78, -1, -1, 81, 82, 
+  83, 84, 85, 86, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
   10, 11, -1, -1, 14, -1, 16, -1, -1, -1, 
   20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
@@ -811,25 +816,16 @@ const int QmlJSGrammar::action_check [] = {
   -1, -1, -1, -1, -1, 65, 66, 67, -1, 69, 
   70, 71, -1, 73, 74, 75, 76, 77, 78, -1, 
   -1, 81, 82, 83, 84, 85, 86, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, 
-  -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, 
-  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
-  -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
-  -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, 
-  -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 
-  -1, 69, 70, 71, -1, 73, 74, 75, 76, 77, 
-  78, -1, -1, 81, 82, 83, 84, 85, 86, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, 
-  -1, -1, -1, 9, -1, 11, 12, 13, 14, -1, 
-  -1, -1, -1, -1, -1, 21, 22, -1, -1, -1, 
-  -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 
-  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
-  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
-  -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 
-  66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 
-  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
-  -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 4, 5, 6, 
+  -1, -1, 9, 10, 11, -1, -1, 14, -1, 16, 
+  -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, 31, 32, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 43, -1, -1, -1, 
+  47, -1, -1, -1, -1, -1, -1, -1, 55, -1, 
+  -1, -1, 59, -1, -1, -1, -1, -1, 65, 66, 
+  67, -1, 69, 70, 71, -1, 73, 74, 75, 76, 
+  77, 78, -1, -1, 81, 82, 83, 84, 85, 86, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   4, -1, -1, -1, -1, 9, -1, 11, 12, 13, 
   14, -1, -1, -1, -1, -1, -1, 21, 22, -1, 
   -1, -1, -1, -1, -1, 29, 30, -1, -1, 33, 
@@ -839,25 +835,35 @@ const int QmlJSGrammar::action_check [] = {
   -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
   74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
   84, 85, -1, 87, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  12, 13, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
-  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, 
-  -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
-  72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
-  82, 83, 84, 85, 86, 87, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 4, 5, 6, -1, -1, 9, 
-  10, 11, 12, 13, 14, -1, 16, -1, -1, -1, 
-  20, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
-  30, 31, 32, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, 55, -1, -1, -1, 59, 
-  -1, 61, -1, -1, -1, 65, 66, 67, 68, 69, 
-  70, 71, 72, 73, 74, 75, 76, 77, 78, -1, 
-  -1, 81, 82, 83, 84, 85, 86, 87, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 
+  11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 
+  21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 
+  61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
+  71, 72, 73, 74, 75, 76, 77, 78, -1, -1, 
+  81, 82, 83, 84, 85, -1, 87, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, 
+  -1, 9, 10, 11, 12, 13, 14, -1, 16, -1, 
+  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
+  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
+  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, 87, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
+  5, 6, -1, -1, 9, 10, 11, 12, 13, 14, 
+  -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, 
+  -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  55, -1, -1, -1, 59, -1, 61, -1, -1, -1, 
+  65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 
+  75, 76, 77, 78, -1, -1, 81, 82, 83, 84, 
+  85, 86, 87, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 
 
   33, 23, 12, 23, 3, 2, 2, 33, 3, 2, 
   34, 3, 10, 2, 33, 65, 3, 2, 12, 3, 
diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index b597f4f..0610bfe 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -59,18 +59,19 @@ class QmlJSGrammar
 public:
   enum {
     EOF_SYMBOL = 0,
-    REDUCE_HERE = 95,
-    SHIFT_THERE = 94,
+    REDUCE_HERE = 96,
+    SHIFT_THERE = 95,
     T_AND = 1,
     T_AND_AND = 2,
     T_AND_EQ = 3,
-    T_AS = 90,
+    T_AS = 91,
     T_AUTOMATIC_SEMICOLON = 62,
     T_BREAK = 4,
     T_CASE = 5,
     T_CATCH = 6,
     T_COLON = 7,
     T_COMMA = 8,
+    T_COMMENT = 88,
     T_CONST = 84,
     T_CONTINUE = 9,
     T_DEBUGGER = 85,
@@ -85,9 +86,9 @@ public:
     T_EQ_EQ = 18,
     T_EQ_EQ_EQ = 19,
     T_FALSE = 83,
-    T_FEED_JS_EXPRESSION = 93,
-    T_FEED_JS_STATEMENT = 92,
-    T_FEED_UI_PROGRAM = 91,
+    T_FEED_JS_EXPRESSION = 94,
+    T_FEED_JS_STATEMENT = 93,
+    T_FEED_UI_PROGRAM = 92,
     T_FINALLY = 20,
     T_FOR = 21,
     T_FUNCTION = 22,
@@ -99,7 +100,7 @@ public:
     T_GT_GT_GT_EQ = 28,
     T_IDENTIFIER = 29,
     T_IF = 30,
-    T_IMPORT = 89,
+    T_IMPORT = 90,
     T_IN = 31,
     T_INSTANCEOF = 32,
     T_LBRACE = 33,
@@ -126,7 +127,7 @@ public:
     T_PLUS_EQ = 52,
     T_PLUS_PLUS = 53,
     T_PROPERTY = 66,
-    T_PUBLIC = 88,
+    T_PUBLIC = 89,
     T_QUESTION = 54,
     T_RBRACE = 55,
     T_RBRACKET = 56,
@@ -158,12 +159,12 @@ public:
     ACCEPT_STATE = 621,
     RULE_COUNT = 337,
     STATE_COUNT = 622,
-    TERMINAL_COUNT = 96,
+    TERMINAL_COUNT = 97,
     NON_TERMINAL_COUNT = 105,
 
     GOTO_INDEX_OFFSET = 622,
-    GOTO_INFO_OFFSET = 2376,
-    GOTO_CHECK_OFFSET = 2376
+    GOTO_INFO_OFFSET = 2402,
+    GOTO_CHECK_OFFSET = 2402
   };
 
   static const char  *const spell [];
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
 
 
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
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index 6bd21f8..70e7737 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -57,7 +57,9 @@
 #include <QtCore/qshareddata.h>
 #include <string.h>
 
-QT_BEGIN_NAMESPACE
+#include "qmljsglobal_p.h"
+
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 
@@ -125,6 +127,6 @@ private:
 
 } // namespace QmlJS
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index e2f0a3c..dfe3bac 100644
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ b/src/declarative/qml/parser/qmljsnodepool_p.h
@@ -56,9 +56,10 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
+#include "qmljsglobal_p.h"
 #include "qmljsmemorypool_p.h"
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 
@@ -133,6 +134,6 @@ private:
 
 } // namespace QmlJS
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 #endif
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index f7d483f..ab4ff63 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -62,7 +62,7 @@
 
 using namespace QmlJS;
 
-QT_BEGIN_NAMESPACE
+QT_QML_BEGIN_NAMESPACE
 
 void Parser::reallocateStack()
 {
@@ -1803,6 +1803,6 @@ case 334: {
     return false;
 }
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE
 
 
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 1db6086..573031f 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -60,15 +60,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 {
 
@@ -226,7 +226,7 @@ protected:
 
 #define J_SCRIPT_REGEXPLITERAL_RULE2 70
 
-QT_END_NAMESPACE
+QT_QML_END_NAMESPACE