diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
index 30a6491d7d3..36df37b10a2 100644
--- a/src/corelib/serialization/qxmlstream.g
+++ b/src/corelib/serialization/qxmlstream.g
@@ -58,7 +58,7 @@
 %token PCDATA "PCDATA"
 
 -- error
-%token ERROR
+%token XML_ERROR
 
 -- entities
 %token PARSE_ENTITY
@@ -251,7 +251,7 @@ bool QXmlStreamReaderPrivate::parse()
             } else switch (token_char) {
             case 0xfffe:
             case 0xffff:
-                token = ERROR;
+                token = XML_ERROR;
                 break;
             case '\r':
                 token = SPACE;
diff --git a/src/corelib/serialization/qxmlstreamgrammar_p.h b/src/corelib/serialization/qxmlstreamgrammar_p.h
index 0ad32327799..80ee8e929f5 100644
--- a/src/corelib/serialization/qxmlstreamgrammar_p.h
+++ b/src/corelib/serialization/qxmlstreamgrammar_p.h
@@ -44,7 +44,6 @@ public:
         ENTITY = 32,
         ENTITY_DONE = 45,
         EQ = 14,
-        XML_ERROR = 43,
         FIXED = 39,
         HASH = 6,
         ID = 48,
@@ -81,6 +80,7 @@ public:
         UNRESOLVED_ENTITY = 46,
         VERSION = 55,
         XML = 54,
+        XML_ERROR = 43,
 
         ACCEPT_STATE = 416,
         RULE_COUNT = 270,