2 files changed, 14 insertions, 4 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index 350ba9f..f1d8826 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -753,12 +753,17 @@ case $rule_number:
 JsIdentifier: T_IDENTIFIER;
 JsIdentifier: T_PROPERTY ;
 /.
-case $rule_number:
+case $rule_number: {
+    QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
 ./
 JsIdentifier: T_SIGNAL ;
 /.
 case $rule_number: {
-    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }
 ./
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index 601e2a2..f0b1f10 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -342,10 +342,15 @@ case 37:
     sym(1).Node = node;
 }   break;
 
-case 39:
+case 39: {
+    QString s = QLatin1String(JavaScriptGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
 
 case 40: {
-    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    QString s = QLatin1String(JavaScriptGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
     break;
 }