diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index 6a1f58490f3..fc046bbe39e 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -5,14 +5,14 @@
 // DO NOT EDIT.
 
 static const short keyword_trans[][128] = {
-    {0,0,0,0,0,0,0,0,0,618,615,0,0,0,0,0,
+    {0,0,0,0,0,0,0,0,0,622,619,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     618,252,616,619,8,38,239,617,25,26,236,234,30,235,27,237,
+     622,256,620,623,8,38,243,621,25,26,240,238,30,239,27,241,
      22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
      0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-     8,21,8,8,8,8,8,8,8,8,8,31,621,32,238,8,
+     8,21,8,8,8,8,8,8,8,8,8,31,625,32,242,8,
      0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
-     14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
+     14,8,15,16,17,18,19,20,8,8,8,36,249,37,252,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -27,15 +27,15 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,240,0,0,0,0,0,287,
-     0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,0,0,0,0,0,0,244,0,0,0,0,0,291,
+     0,0,345,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,109,0,0,0,0,0,0,280,0,0,0,121,0,0,80,
+     0,109,0,0,0,0,0,0,284,0,0,0,121,0,0,80,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -43,7 +43,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,229,0,0,0,0,0,0,0,0,0,312,
+     0,0,0,0,0,233,0,0,0,0,0,0,0,0,0,316,
      0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -51,7 +51,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,327,0,133,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,331,0,133,0,
      0,0,0,0,0,0,0,0,168,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -59,7 +59,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,339,
+     0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,343,
      0,0,116,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -67,7 +67,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,326,0,0,0,0,0,0,0,198,0,
+     0,0,0,0,0,0,330,0,0,0,0,0,0,0,198,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -75,7 +75,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,125,0,0,0,227,0,0,0,0,0,0,0,0,0,253,
+     0,125,0,0,0,231,0,0,0,0,0,0,0,0,0,257,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -91,8 +91,8 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,290,222,0,0,524,0,0,0,
-     0,0,0,0,55,0,0,330,0,0,0,0,0,0,0,0},
+     0,0,0,0,0,0,0,0,294,226,0,0,528,0,0,0,
+     0,0,0,0,55,0,0,334,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -115,7 +115,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,144,0,0,0,0,0,208,
+     0,0,0,0,0,0,0,0,0,144,0,0,0,0,0,212,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -123,20 +123,20 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,283,0,0,0,0,335,0,0,0,0,0,0,0,
+     0,0,0,287,0,0,0,0,339,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,401,0,0,0,0,0,0,0,0,0,0,357,
+     0,0,0,0,405,0,0,0,0,0,0,0,0,0,0,361,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,36,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,33,0,263,272,0,0,
+     0,0,0,0,0,0,0,0,0,0,33,0,267,276,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -144,7 +144,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,273,264,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,277,268,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -152,7 +152,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
-     624,624,624,624,624,624,624,624,624,624,0,0,0,0,0,0,
+     628,628,628,628,628,628,628,628,628,628,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -168,7 +168,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,259,37,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,263,37,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -188,14 +188,14 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,176,0,66,0,0,0,0,0,0,
-     0,0,0,0,353,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,0,357,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,249,81,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,253,81,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -204,7 +204,15 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,82,345,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,82,349,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,84,
+     0,0,0,0,0,208,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -228,7 +236,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,319,110,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,323,110,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -236,7 +244,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,141,0,0,0,0,0,0,
-     0,0,0,302,0,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -268,14 +276,14 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,199,0,0,0,
-     0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0},
+     0,0,0,0,298,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,317,0,0,209,0,0,0,
+     0,0,0,0,0,0,0,0,0,321,0,0,213,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -283,110 +291,46 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,298,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,223,0,0,0,0,0},
+     0,0,0,0,0,0,0,302,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,227,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,321,0,0,0,0,0,230,0,0,0,
+     0,0,0,0,0,0,325,0,0,0,0,0,234,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,280,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,256,278,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,281,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,260,282,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,623,0,0,0,0,622,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,274,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,261,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,246,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,627,0,0,0,0,626,
      0,0,0,0,0,0,0,0,0,0,0,0,0,262,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,521,0,0,0,300,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,502,451,435,443,380,0,511,0,0,0,604,364,358,
-     393,0,596,499,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,
-     0,0,394,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,538,0,0,0,0,0,395,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,403,0,0,0,0,0,0,0,0,0,0,0,548,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,415,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -394,22 +338,46 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,439,0,0,0,0,0,0,0,0,0,0,0,440,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,250,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,279,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,525,0,0,0,304,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,506,455,439,447,384,0,515,0,0,0,608,368,362,
+     397,0,600,503,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,447,0,0,0,0,0,0,0,0,0,0,0,448,
+     0,0,0,0,0,0,0,0,0,0,0,0,425,0,0,0,
+     0,0,398,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,481,459,0,0,464,0,0,0,473,0,0,
+     0,0,0,0,0,0,0,0,0,542,0,0,0,0,0,399,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -417,7 +385,15 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,565,0,500,0,0,0,528,0,0,534,0,0,0,
+     0,407,0,0,0,0,0,0,0,0,0,0,0,552,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,586,0,0,0,0,0,419,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -426,7 +402,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,513,0,558,0,0,0,0,0,0,0,0,0,
+     0,0,0,443,0,0,0,0,0,0,0,0,0,0,0,444,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -434,7 +410,39 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     574,0,0,544,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,451,0,0,0,0,0,0,0,0,0,0,0,452,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,485,463,0,0,468,0,0,0,477,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,569,0,504,0,0,0,532,0,0,538,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,517,0,562,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+     578,0,0,548,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
 };
@@ -454,13 +462,13 @@ static const struct
     {CHARACTER, 4, 0, 0, NOTOKEN},
     {CHARACTER, 5, 0, 0, NOTOKEN},
     {CHARACTER, 6, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 111, 350, NOTOKEN},
+    {CHARACTER, 0, 111, 354, NOTOKEN},
     {CHARACTER, 0, 0, 0, NOTOKEN},
     {CHARACTER, 7, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 111, 295, NOTOKEN},
+    {CHARACTER, 0, 111, 299, NOTOKEN},
     {CHARACTER, 0, 117, 186, NOTOKEN},
     {CHARACTER, 8, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 112, 215, NOTOKEN},
+    {CHARACTER, 0, 112, 219, NOTOKEN},
     {CHARACTER, 9, 0, 0, NOTOKEN},
     {CHARACTER, 0, 101, 65, NOTOKEN},
     {CHARACTER, 10, 0, 0, NOTOKEN},
@@ -486,7 +494,7 @@ static const struct
     {LBRACE, 0, 0, 0, NOTOKEN},
     {RBRACE, 0, 0, 0, NOTOKEN},
     {PERCENT, 20, 0, 0, NOTOKEN},
-    {EQ, 0, 61, 267, NOTOKEN},
+    {EQ, 0, 61, 271, NOTOKEN},
     {SCOPE, 0, 0, 0, NOTOKEN},
     {SEMIC, 0, 0, 0, NOTOKEN},
     {DOTSTAR, 0, 0, 0, NOTOKEN},
@@ -530,7 +538,7 @@ static const struct
     {CHARACTER, 23, 0, 0, CHARACTER},
     {CHARACTER, 24, 0, 0, CHARACTER},
     {CHARACTER, 0, 116, 83, CHARACTER},
-    {CONST, 0, 95, 84, CHARACTER},
+    {CONST, 25, 0, 0, CHARACTER},
     {CHARACTER, 0, 99, 85, CHARACTER},
     {CHARACTER, 0, 97, 86, CHARACTER},
     {CHARACTER, 0, 115, 87, CHARACTER},
@@ -538,10 +546,10 @@ static const struct
     {CONST_CAST, 0, 0, 0, CHARACTER},
     {CHARACTER, 0, 112, 90, CHARACTER},
     {CHARACTER, 0, 101, 91, CHARACTER},
-    {CHARACTER, 25, 0, 0, CHARACTER},
+    {CHARACTER, 26, 0, 0, CHARACTER},
     {CHARACTER, 0, 100, 93, CHARACTER},
     {TYPEID, 0, 0, 0, CHARACTER},
-    {CHARACTER, 26, 0, 0, CHARACTER},
+    {CHARACTER, 27, 0, 0, CHARACTER},
     {CHARACTER, 0, 115, 96, CHARACTER},
     {THIS, 0, 0, 0, CHARACTER},
     {CHARACTER, 0, 109, 98, CHARACTER},
@@ -556,7 +564,7 @@ static const struct
     {THROW, 0, 0, 0, CHARACTER},
     {CHARACTER, 0, 121, 108, CHARACTER},
     {TRY, 0, 0, 0, CHARACTER},
-    {CHARACTER, 27, 0, 0, CHARACTER},
+    {CHARACTER, 28, 0, 0, CHARACTER},
     {CHARACTER, 0, 99, 111, CHARACTER},
     {CHARACTER, 0, 104, 112, CHARACTER},
     {CATCH, 0, 0, 0, CHARACTER},
@@ -587,7 +595,7 @@ static const struct
     {CHARACTER, 0, 99, 138, CHARACTER},
     {CHARACTER, 0, 116, 139, CHARACTER},
     {STRUCT, 0, 0, 0, CHARACTER},
-    {CHARACTER, 28, 0, 0, CHARACTER},
+    {CHARACTER, 29, 0, 0, CHARACTER},
     {CHARACTER, 0, 111, 142, CHARACTER},
     {CHARACTER, 0, 110, 143, CHARACTER},
     {UNION, 0, 0, 0, CHARACTER},
@@ -597,7 +605,7 @@ static const struct
     {CHARACTER, 0, 97, 148, CHARACTER},
     {CHARACTER, 0, 108, 149, CHARACTER},
     {VIRTUAL, 0, 0, 0, CHARACTER},
-    {CHARACTER, 29, 0, 0, CHARACTER},
+    {CHARACTER, 30, 0, 0, CHARACTER},
     {CHARACTER, 0, 118, 152, CHARACTER},
     {CHARACTER, 0, 97, 153, CHARACTER},
     {CHARACTER, 0, 116, 154, CHARACTER},
@@ -615,8 +623,8 @@ static const struct
     {CHARACTER, 0, 105, 166, CHARACTER},
     {CHARACTER, 0, 99, 167, CHARACTER},
     {PUBLIC, 0, 0, 0, CHARACTER},
-    {CHARACTER, 30, 0, 0, CHARACTER},
     {CHARACTER, 31, 0, 0, CHARACTER},
+    {CHARACTER, 32, 0, 0, CHARACTER},
     {CHARACTER, 0, 114, 171, CHARACTER},
     {CHARACTER, 0, 116, 172, CHARACTER},
     {EXPORT, 0, 0, 0, CHARACTER},
@@ -645,7 +653,7 @@ static const struct
     {CHARACTER, 0, 110, 196, CHARACTER},
     {CHARACTER, 0, 103, 197, CHARACTER},
     {USING, 0, 0, 0, CHARACTER},
-    {CHARACTER, 32, 0, 0, CHARACTER},
+    {CHARACTER, 33, 0, 0, CHARACTER},
     {CHARACTER, 0, 105, 200, CHARACTER},
     {CHARACTER, 0, 110, 201, CHARACTER},
     {CHARACTER, 0, 101, 202, CHARACTER},
@@ -655,53 +663,57 @@ static const struct
     {CHARACTER, 0, 105, 206, CHARACTER},
     {CHARACTER, 0, 116, 207, CHARACTER},
     {EXPLICIT, 0, 0, 0, CHARACTER},
-    {CHARACTER, 33, 0, 0, CHARACTER},
-    {CHARACTER, 0, 97, 210, CHARACTER},
-    {CHARACTER, 0, 116, 211, CHARACTER},
-    {CHARACTER, 0, 105, 212, CHARACTER},
-    {CHARACTER, 0, 108, 213, CHARACTER},
-    {CHARACTER, 0, 101, 214, CHARACTER},
-    {VOLATILE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 101, 216, CHARACTER},
-    {CHARACTER, 0, 114, 217, CHARACTER},
-    {CHARACTER, 0, 97, 218, CHARACTER},
-    {CHARACTER, 0, 116, 219, CHARACTER},
-    {CHARACTER, 0, 111, 220, CHARACTER},
-    {CHARACTER, 0, 114, 221, CHARACTER},
-    {OPERATOR, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 120, 209, CHARACTER},
+    {CHARACTER, 0, 112, 210, CHARACTER},
+    {CHARACTER, 0, 114, 211, CHARACTER},
+    {CONSTEXPR, 0, 0, 0, CHARACTER},
     {CHARACTER, 34, 0, 0, CHARACTER},
-    {CHARACTER, 0, 101, 224, CHARACTER},
-    {CHARACTER, 0, 111, 225, CHARACTER},
-    {CHARACTER, 0, 102, 226, CHARACTER},
-    {SIZEOF, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 119, 228, CHARACTER},
-    {NEW, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 97, 214, CHARACTER},
+    {CHARACTER, 0, 116, 215, CHARACTER},
+    {CHARACTER, 0, 105, 216, CHARACTER},
+    {CHARACTER, 0, 108, 217, CHARACTER},
+    {CHARACTER, 0, 101, 218, CHARACTER},
+    {VOLATILE, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 101, 220, CHARACTER},
+    {CHARACTER, 0, 114, 221, CHARACTER},
+    {CHARACTER, 0, 97, 222, CHARACTER},
+    {CHARACTER, 0, 116, 223, CHARACTER},
+    {CHARACTER, 0, 111, 224, CHARACTER},
+    {CHARACTER, 0, 114, 225, CHARACTER},
+    {OPERATOR, 0, 0, 0, CHARACTER},
     {CHARACTER, 35, 0, 0, CHARACTER},
-    {CHARACTER, 0, 101, 231, CHARACTER},
-    {CHARACTER, 0, 116, 232, CHARACTER},
-    {CHARACTER, 0, 101, 233, CHARACTER},
+    {CHARACTER, 0, 101, 228, CHARACTER},
+    {CHARACTER, 0, 111, 229, CHARACTER},
+    {CHARACTER, 0, 102, 230, CHARACTER},
+    {SIZEOF, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 119, 232, CHARACTER},
+    {NEW, 0, 0, 0, CHARACTER},
+    {CHARACTER, 36, 0, 0, CHARACTER},
+    {CHARACTER, 0, 101, 235, CHARACTER},
+    {CHARACTER, 0, 116, 236, CHARACTER},
+    {CHARACTER, 0, 101, 237, CHARACTER},
     {DELETE, 0, 0, 0, CHARACTER},
-    {PLUS, 36, 0, 0, NOTOKEN},
-    {MINUS, 37, 0, 0, NOTOKEN},
-    {STAR, 0, 61, 257, NOTOKEN},
-    {SLASH, 38, 0, 0, NOTOKEN},
-    {HAT, 0, 61, 260, NOTOKEN},
-    {AND, 39, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 116, 241, CHARACTER},
-    {CHARACTER, 40, 0, 0, CHARACTER},
-    {CHARACTER, 0, 110, 243, CHARACTER},
-    {CHARACTER, 0, 100, 244, CHARACTER},
+    {PLUS, 37, 0, 0, NOTOKEN},
+    {MINUS, 38, 0, 0, NOTOKEN},
+    {STAR, 0, 61, 261, NOTOKEN},
+    {SLASH, 39, 0, 0, NOTOKEN},
+    {HAT, 0, 61, 264, NOTOKEN},
+    {AND, 40, 0, 0, NOTOKEN},
+    {CHARACTER, 0, 116, 245, CHARACTER},
+    {CHARACTER, 41, 0, 0, CHARACTER},
+    {CHARACTER, 0, 110, 247, CHARACTER},
+    {CHARACTER, 0, 100, 248, CHARACTER},
     {AND, 0, 0, 0, CHARACTER},
-    {OR, 41, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 114, 247, CHARACTER},
+    {OR, 42, 0, 0, NOTOKEN},
+    {CHARACTER, 0, 114, 251, CHARACTER},
     {OR, 0, 0, 0, CHARACTER},
     {TILDE, 0, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 112, 250, CHARACTER},
-    {CHARACTER, 0, 108, 251, CHARACTER},
+    {CHARACTER, 0, 112, 254, CHARACTER},
+    {CHARACTER, 0, 108, 255, CHARACTER},
     {TILDE, 0, 0, 0, CHARACTER},
-    {NOT, 0, 61, 268, NOTOKEN},
-    {CHARACTER, 0, 116, 254, CHARACTER},
-    {NOT, 0, 95, 269, CHARACTER},
+    {NOT, 0, 61, 272, NOTOKEN},
+    {CHARACTER, 0, 116, 258, CHARACTER},
+    {NOT, 0, 95, 273, CHARACTER},
     {PLUS_EQ, 0, 0, 0, NOTOKEN},
     {MINUS_EQ, 0, 0, 0, NOTOKEN},
     {STAR_EQ, 0, 0, 0, NOTOKEN},
@@ -710,14 +722,14 @@ static const struct
     {HAT_EQ, 0, 0, 0, NOTOKEN},
     {AND_EQ, 0, 0, 0, NOTOKEN},
     {OR_EQ, 0, 0, 0, NOTOKEN},
-    {LTLT, 0, 61, 266, NOTOKEN},
-    {GTGT, 0, 61, 265, NOTOKEN},
+    {LTLT, 0, 61, 270, NOTOKEN},
+    {GTGT, 0, 61, 269, NOTOKEN},
     {GTGT_EQ, 0, 0, 0, NOTOKEN},
     {LTLT_EQ, 0, 0, 0, NOTOKEN},
     {EQEQ, 0, 0, 0, NOTOKEN},
     {NE, 0, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 101, 270, CHARACTER},
-    {CHARACTER, 0, 113, 271, CHARACTER},
+    {CHARACTER, 0, 101, 274, CHARACTER},
+    {CHARACTER, 0, 113, 275, CHARACTER},
     {NE, 0, 0, 0, CHARACTER},
     {LE, 0, 0, 0, NOTOKEN},
     {GE, 0, 0, 0, NOTOKEN},
@@ -725,348 +737,348 @@ static const struct
     {OROR, 0, 0, 0, NOTOKEN},
     {INCR, 0, 0, 0, NOTOKEN},
     {DECR, 0, 0, 0, NOTOKEN},
-    {ARROW, 0, 42, 279, NOTOKEN},
+    {ARROW, 0, 42, 283, NOTOKEN},
     {ARROW_STAR, 0, 0, 0, NOTOKEN},
-    {CHARACTER, 0, 97, 281, CHARACTER},
-    {CHARACTER, 0, 114, 282, CHARACTER},
-    {CHAR, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 104, 284, CHARACTER},
     {CHARACTER, 0, 97, 285, CHARACTER},
     {CHARACTER, 0, 114, 286, CHARACTER},
+    {CHAR, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 104, 288, CHARACTER},
+    {CHARACTER, 0, 97, 289, CHARACTER},
+    {CHARACTER, 0, 114, 290, CHARACTER},
     {WCHAR, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 111, 288, CHARACTER},
-    {CHARACTER, 0, 108, 289, CHARACTER},
+    {CHARACTER, 0, 111, 292, CHARACTER},
+    {CHARACTER, 0, 108, 293, CHARACTER},
     {BOOL, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 111, 291, CHARACTER},
-    {CHARACTER, 0, 114, 292, CHARACTER},
-    {CHARACTER, 0, 116, 293, CHARACTER},
+    {CHARACTER, 0, 111, 295, CHARACTER},
+    {CHARACTER, 0, 114, 296, CHARACTER},
+    {CHARACTER, 0, 116, 297, CHARACTER},
     {SHORT, 0, 0, 0, CHARACTER},
     {INT, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 110, 296, CHARACTER},
-    {CHARACTER, 0, 103, 297, CHARACTER},
+    {CHARACTER, 0, 110, 300, CHARACTER},
+    {CHARACTER, 0, 103, 301, CHARACTER},
     {LONG, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 110, 299, CHARACTER},
-    {CHARACTER, 42, 0, 0, CHARACTER},
-    {CHARACTER, 0, 100, 301, CHARACTER},
+    {CHARACTER, 0, 110, 303, CHARACTER},
+    {CHARACTER, 43, 0, 0, CHARACTER},
+    {CHARACTER, 0, 100, 305, CHARACTER},
     {SIGNED, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 105, 303, CHARACTER},
-    {CHARACTER, 0, 103, 304, CHARACTER},
-    {CHARACTER, 0, 110, 305, CHARACTER},
-    {CHARACTER, 0, 101, 306, CHARACTER},
-    {CHARACTER, 0, 100, 307, CHARACTER},
+    {CHARACTER, 0, 105, 307, CHARACTER},
+    {CHARACTER, 0, 103, 308, CHARACTER},
+    {CHARACTER, 0, 110, 309, CHARACTER},
+    {CHARACTER, 0, 101, 310, CHARACTER},
+    {CHARACTER, 0, 100, 311, CHARACTER},
     {UNSIGNED, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 111, 309, CHARACTER},
-    {CHARACTER, 0, 97, 310, CHARACTER},
-    {CHARACTER, 0, 116, 311, CHARACTER},
+    {CHARACTER, 0, 111, 313, CHARACTER},
+    {CHARACTER, 0, 97, 314, CHARACTER},
+    {CHARACTER, 0, 116, 315, CHARACTER},
     {FLOAT, 0, 0, 0, CHARACTER},
-    {DO, 0, 117, 313, CHARACTER},
-    {CHARACTER, 0, 98, 314, CHARACTER},
-    {CHARACTER, 0, 108, 315, CHARACTER},
-    {CHARACTER, 0, 101, 316, CHARACTER},
-    {DOUBLE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 100, 318, CHARACTER},
-    {VOID, 0, 0, 0, CHARACTER},
+    {DO, 0, 117, 317, CHARACTER},
+    {CHARACTER, 0, 98, 318, CHARACTER},
+    {CHARACTER, 0, 108, 319, CHARACTER},
     {CHARACTER, 0, 101, 320, CHARACTER},
+    {DOUBLE, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 100, 322, CHARACTER},
+    {VOID, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 101, 324, CHARACTER},
     {CASE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 97, 322, CHARACTER},
-    {CHARACTER, 0, 117, 323, CHARACTER},
-    {CHARACTER, 0, 108, 324, CHARACTER},
-    {CHARACTER, 0, 116, 325, CHARACTER},
+    {CHARACTER, 0, 97, 326, CHARACTER},
+    {CHARACTER, 0, 117, 327, CHARACTER},
+    {CHARACTER, 0, 108, 328, CHARACTER},
+    {CHARACTER, 0, 116, 329, CHARACTER},
     {DEFAULT, 0, 0, 0, CHARACTER},
     {IF, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 115, 328, CHARACTER},
-    {CHARACTER, 0, 101, 329, CHARACTER},
+    {CHARACTER, 0, 115, 332, CHARACTER},
+    {CHARACTER, 0, 101, 333, CHARACTER},
     {ELSE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 105, 331, CHARACTER},
-    {CHARACTER, 0, 116, 332, CHARACTER},
-    {CHARACTER, 0, 99, 333, CHARACTER},
-    {CHARACTER, 0, 104, 334, CHARACTER},
+    {CHARACTER, 0, 105, 335, CHARACTER},
+    {CHARACTER, 0, 116, 336, CHARACTER},
+    {CHARACTER, 0, 99, 337, CHARACTER},
+    {CHARACTER, 0, 104, 338, CHARACTER},
     {SWITCH, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 105, 336, CHARACTER},
-    {CHARACTER, 0, 108, 337, CHARACTER},
-    {CHARACTER, 0, 101, 338, CHARACTER},
-    {WHILE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 114, 340, CHARACTER},
-    {FOR, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 105, 340, CHARACTER},
+    {CHARACTER, 0, 108, 341, CHARACTER},
     {CHARACTER, 0, 101, 342, CHARACTER},
-    {CHARACTER, 0, 97, 343, CHARACTER},
-    {CHARACTER, 0, 107, 344, CHARACTER},
+    {WHILE, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 114, 344, CHARACTER},
+    {FOR, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 101, 346, CHARACTER},
+    {CHARACTER, 0, 97, 347, CHARACTER},
+    {CHARACTER, 0, 107, 348, CHARACTER},
     {BREAK, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 105, 346, CHARACTER},
-    {CHARACTER, 0, 110, 347, CHARACTER},
-    {CHARACTER, 0, 117, 348, CHARACTER},
-    {CHARACTER, 0, 101, 349, CHARACTER},
+    {CHARACTER, 0, 105, 350, CHARACTER},
+    {CHARACTER, 0, 110, 351, CHARACTER},
+    {CHARACTER, 0, 117, 352, CHARACTER},
+    {CHARACTER, 0, 101, 353, CHARACTER},
     {CONTINUE, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 116, 351, CHARACTER},
-    {CHARACTER, 0, 111, 352, CHARACTER},
+    {CHARACTER, 0, 116, 355, CHARACTER},
+    {CHARACTER, 0, 111, 356, CHARACTER},
     {GOTO, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 117, 354, CHARACTER},
-    {CHARACTER, 0, 114, 355, CHARACTER},
-    {CHARACTER, 0, 110, 356, CHARACTER},
+    {CHARACTER, 0, 117, 358, CHARACTER},
+    {CHARACTER, 0, 114, 359, CHARACTER},
+    {CHARACTER, 0, 110, 360, CHARACTER},
     {RETURN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 43, 0, 0, CHARACTER},
-    {CHARACTER, 0, 66, 359, CHARACTER},
-    {CHARACTER, 0, 74, 360, CHARACTER},
-    {CHARACTER, 0, 69, 361, CHARACTER},
-    {CHARACTER, 0, 67, 362, CHARACTER},
-    {CHARACTER, 0, 84, 363, CHARACTER},
-    {Q_OBJECT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 65, 365, CHARACTER},
-    {CHARACTER, 0, 77, 366, CHARACTER},
-    {CHARACTER, 0, 69, 367, CHARACTER},
-    {CHARACTER, 0, 83, 368, CHARACTER},
-    {CHARACTER, 0, 80, 369, CHARACTER},
-    {CHARACTER, 0, 65, 370, CHARACTER},
-    {CHARACTER, 0, 67, 371, CHARACTER},
-    {CHARACTER, 0, 69, 372, CHARACTER},
-    {Q_NAMESPACE_TOKEN, 0, 95, 373, CHARACTER},
-    {CHARACTER, 0, 69, 374, CHARACTER},
-    {CHARACTER, 0, 88, 375, CHARACTER},
-    {CHARACTER, 0, 80, 376, CHARACTER},
-    {CHARACTER, 0, 79, 377, CHARACTER},
-    {CHARACTER, 0, 82, 378, CHARACTER},
-    {CHARACTER, 0, 84, 379, CHARACTER},
-    {Q_NAMESPACE_EXPORT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 65, 381, CHARACTER},
-    {CHARACTER, 0, 68, 382, CHARACTER},
-    {CHARACTER, 0, 71, 383, CHARACTER},
-    {CHARACTER, 0, 69, 384, CHARACTER},
-    {CHARACTER, 0, 84, 385, CHARACTER},
-    {Q_GADGET_TOKEN, 0, 95, 386, CHARACTER},
-    {CHARACTER, 0, 69, 387, CHARACTER},
-    {CHARACTER, 0, 88, 388, CHARACTER},
-    {CHARACTER, 0, 80, 389, CHARACTER},
-    {CHARACTER, 0, 79, 390, CHARACTER},
-    {CHARACTER, 0, 82, 391, CHARACTER},
-    {CHARACTER, 0, 84, 392, CHARACTER},
-    {Q_GADGET_EXPORT_TOKEN, 0, 0, 0, CHARACTER},
     {CHARACTER, 44, 0, 0, CHARACTER},
+    {CHARACTER, 0, 66, 363, CHARACTER},
+    {CHARACTER, 0, 74, 364, CHARACTER},
+    {CHARACTER, 0, 69, 365, CHARACTER},
+    {CHARACTER, 0, 67, 366, CHARACTER},
+    {CHARACTER, 0, 84, 367, CHARACTER},
+    {Q_OBJECT_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 65, 369, CHARACTER},
+    {CHARACTER, 0, 77, 370, CHARACTER},
+    {CHARACTER, 0, 69, 371, CHARACTER},
+    {CHARACTER, 0, 83, 372, CHARACTER},
+    {CHARACTER, 0, 80, 373, CHARACTER},
+    {CHARACTER, 0, 65, 374, CHARACTER},
+    {CHARACTER, 0, 67, 375, CHARACTER},
+    {CHARACTER, 0, 69, 376, CHARACTER},
+    {Q_NAMESPACE_TOKEN, 0, 95, 377, CHARACTER},
+    {CHARACTER, 0, 69, 378, CHARACTER},
+    {CHARACTER, 0, 88, 379, CHARACTER},
+    {CHARACTER, 0, 80, 380, CHARACTER},
+    {CHARACTER, 0, 79, 381, CHARACTER},
+    {CHARACTER, 0, 82, 382, CHARACTER},
+    {CHARACTER, 0, 84, 383, CHARACTER},
+    {Q_NAMESPACE_EXPORT_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 65, 385, CHARACTER},
+    {CHARACTER, 0, 68, 386, CHARACTER},
+    {CHARACTER, 0, 71, 387, CHARACTER},
+    {CHARACTER, 0, 69, 388, CHARACTER},
+    {CHARACTER, 0, 84, 389, CHARACTER},
+    {Q_GADGET_TOKEN, 0, 95, 390, CHARACTER},
+    {CHARACTER, 0, 69, 391, CHARACTER},
+    {CHARACTER, 0, 88, 392, CHARACTER},
+    {CHARACTER, 0, 80, 393, CHARACTER},
+    {CHARACTER, 0, 79, 394, CHARACTER},
+    {CHARACTER, 0, 82, 395, CHARACTER},
+    {CHARACTER, 0, 84, 396, CHARACTER},
+    {Q_GADGET_EXPORT_TOKEN, 0, 0, 0, CHARACTER},
     {CHARACTER, 45, 0, 0, CHARACTER},
-    {CHARACTER, 0, 80, 396, CHARACTER},
-    {CHARACTER, 0, 69, 397, CHARACTER},
-    {CHARACTER, 0, 82, 398, CHARACTER},
-    {CHARACTER, 0, 84, 399, CHARACTER},
-    {CHARACTER, 0, 89, 400, CHARACTER},
-    {Q_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 95, 402, CHARACTER},
     {CHARACTER, 46, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 404, CHARACTER},
-    {CHARACTER, 0, 79, 405, CHARACTER},
-    {CHARACTER, 0, 78, 406, CHARACTER},
-    {CHARACTER, 0, 89, 407, CHARACTER},
-    {CHARACTER, 0, 77, 408, CHARACTER},
-    {CHARACTER, 0, 79, 409, CHARACTER},
-    {CHARACTER, 0, 85, 410, CHARACTER},
-    {CHARACTER, 0, 83, 411, CHARACTER},
-    {CHARACTER, 0, 95, 412, CHARACTER},
-    {CHARACTER, 0, 80, 413, CHARACTER},
-    {CHARACTER, 0, 82, 414, CHARACTER},
+    {CHARACTER, 0, 80, 400, CHARACTER},
+    {CHARACTER, 0, 69, 401, CHARACTER},
+    {CHARACTER, 0, 82, 402, CHARACTER},
+    {CHARACTER, 0, 84, 403, CHARACTER},
+    {CHARACTER, 0, 89, 404, CHARACTER},
+    {Q_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 95, 406, CHARACTER},
     {CHARACTER, 47, 0, 0, CHARACTER},
-    {CHARACTER, 0, 80, 416, CHARACTER},
-    {CHARACTER, 0, 69, 417, CHARACTER},
+    {CHARACTER, 0, 78, 408, CHARACTER},
+    {CHARACTER, 0, 79, 409, CHARACTER},
+    {CHARACTER, 0, 78, 410, CHARACTER},
+    {CHARACTER, 0, 89, 411, CHARACTER},
+    {CHARACTER, 0, 77, 412, CHARACTER},
+    {CHARACTER, 0, 79, 413, CHARACTER},
+    {CHARACTER, 0, 85, 414, CHARACTER},
+    {CHARACTER, 0, 83, 415, CHARACTER},
+    {CHARACTER, 0, 95, 416, CHARACTER},
+    {CHARACTER, 0, 80, 417, CHARACTER},
     {CHARACTER, 0, 82, 418, CHARACTER},
-    {CHARACTER, 0, 84, 419, CHARACTER},
-    {CHARACTER, 0, 89, 420, CHARACTER},
+    {CHARACTER, 48, 0, 0, CHARACTER},
+    {CHARACTER, 0, 80, 420, CHARACTER},
+    {CHARACTER, 0, 69, 421, CHARACTER},
+    {CHARACTER, 0, 82, 422, CHARACTER},
+    {CHARACTER, 0, 84, 423, CHARACTER},
+    {CHARACTER, 0, 89, 424, CHARACTER},
     {QT_ANONYMOUS_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 85, 422, CHARACTER},
-    {CHARACTER, 0, 71, 423, CHARACTER},
-    {CHARACTER, 0, 73, 424, CHARACTER},
-    {CHARACTER, 0, 78, 425, CHARACTER},
-    {CHARACTER, 0, 95, 426, CHARACTER},
-    {CHARACTER, 0, 77, 427, CHARACTER},
-    {CHARACTER, 0, 69, 428, CHARACTER},
-    {CHARACTER, 0, 84, 429, CHARACTER},
-    {CHARACTER, 0, 65, 430, CHARACTER},
-    {CHARACTER, 0, 68, 431, CHARACTER},
-    {CHARACTER, 0, 65, 432, CHARACTER},
+    {CHARACTER, 0, 85, 426, CHARACTER},
+    {CHARACTER, 0, 71, 427, CHARACTER},
+    {CHARACTER, 0, 73, 428, CHARACTER},
+    {CHARACTER, 0, 78, 429, CHARACTER},
+    {CHARACTER, 0, 95, 430, CHARACTER},
+    {CHARACTER, 0, 77, 431, CHARACTER},
+    {CHARACTER, 0, 69, 432, CHARACTER},
     {CHARACTER, 0, 84, 433, CHARACTER},
     {CHARACTER, 0, 65, 434, CHARACTER},
+    {CHARACTER, 0, 68, 435, CHARACTER},
+    {CHARACTER, 0, 65, 436, CHARACTER},
+    {CHARACTER, 0, 84, 437, CHARACTER},
+    {CHARACTER, 0, 65, 438, CHARACTER},
     {Q_PLUGIN_METADATA_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 436, CHARACTER},
-    {CHARACTER, 0, 85, 437, CHARACTER},
-    {CHARACTER, 0, 77, 438, CHARACTER},
-    {Q_ENUM_TOKEN, 48, 0, 0, CHARACTER},
+    {CHARACTER, 0, 78, 440, CHARACTER},
+    {CHARACTER, 0, 85, 441, CHARACTER},
+    {CHARACTER, 0, 77, 442, CHARACTER},
+    {Q_ENUM_TOKEN, 49, 0, 0, CHARACTER},
     {Q_ENUMS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 441, CHARACTER},
-    {CHARACTER, 0, 83, 442, CHARACTER},
+    {CHARACTER, 0, 78, 445, CHARACTER},
+    {CHARACTER, 0, 83, 446, CHARACTER},
     {Q_ENUM_NS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 444, CHARACTER},
-    {CHARACTER, 0, 65, 445, CHARACTER},
-    {CHARACTER, 0, 71, 446, CHARACTER},
-    {Q_FLAG_TOKEN, 49, 0, 0, CHARACTER},
+    {CHARACTER, 0, 76, 448, CHARACTER},
+    {CHARACTER, 0, 65, 449, CHARACTER},
+    {CHARACTER, 0, 71, 450, CHARACTER},
+    {Q_FLAG_TOKEN, 50, 0, 0, CHARACTER},
     {Q_FLAGS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 449, CHARACTER},
-    {CHARACTER, 0, 83, 450, CHARACTER},
+    {CHARACTER, 0, 78, 453, CHARACTER},
+    {CHARACTER, 0, 83, 454, CHARACTER},
     {Q_FLAG_NS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 452, CHARACTER},
-    {CHARACTER, 0, 67, 453, CHARACTER},
-    {CHARACTER, 0, 76, 454, CHARACTER},
-    {CHARACTER, 0, 65, 455, CHARACTER},
-    {CHARACTER, 0, 82, 456, CHARACTER},
-    {CHARACTER, 0, 69, 457, CHARACTER},
-    {CHARACTER, 0, 95, 458, CHARACTER},
-    {CHARACTER, 50, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 460, CHARACTER},
-    {CHARACTER, 0, 65, 461, CHARACTER},
-    {CHARACTER, 0, 71, 462, CHARACTER},
-    {CHARACTER, 0, 83, 463, CHARACTER},
-    {Q_DECLARE_FLAGS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 465, CHARACTER},
-    {CHARACTER, 0, 84, 466, CHARACTER},
-    {CHARACTER, 0, 69, 467, CHARACTER},
-    {CHARACTER, 0, 82, 468, CHARACTER},
-    {CHARACTER, 0, 70, 469, CHARACTER},
-    {CHARACTER, 0, 65, 470, CHARACTER},
-    {CHARACTER, 0, 67, 471, CHARACTER},
-    {CHARACTER, 0, 69, 472, CHARACTER},
-    {Q_DECLARE_INTERFACE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 474, CHARACTER},
-    {CHARACTER, 0, 84, 475, CHARACTER},
-    {CHARACTER, 0, 65, 476, CHARACTER},
-    {CHARACTER, 0, 84, 477, CHARACTER},
-    {CHARACTER, 0, 89, 478, CHARACTER},
-    {CHARACTER, 0, 80, 479, CHARACTER},
-    {CHARACTER, 0, 69, 480, CHARACTER},
-    {Q_DECLARE_METATYPE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 88, 482, CHARACTER},
-    {CHARACTER, 0, 84, 483, CHARACTER},
-    {CHARACTER, 0, 69, 484, CHARACTER},
-    {CHARACTER, 0, 78, 485, CHARACTER},
-    {CHARACTER, 0, 83, 486, CHARACTER},
-    {CHARACTER, 0, 73, 487, CHARACTER},
-    {CHARACTER, 0, 79, 488, CHARACTER},
-    {CHARACTER, 0, 78, 489, CHARACTER},
-    {CHARACTER, 0, 95, 490, CHARACTER},
-    {CHARACTER, 0, 73, 491, CHARACTER},
-    {CHARACTER, 0, 78, 492, CHARACTER},
-    {CHARACTER, 0, 84, 493, CHARACTER},
-    {CHARACTER, 0, 69, 494, CHARACTER},
-    {CHARACTER, 0, 82, 495, CHARACTER},
-    {CHARACTER, 0, 70, 496, CHARACTER},
-    {CHARACTER, 0, 65, 497, CHARACTER},
-    {CHARACTER, 0, 67, 498, CHARACTER},
-    {CHARACTER, 0, 69, 472, CHARACTER},
+    {CHARACTER, 0, 69, 456, CHARACTER},
+    {CHARACTER, 0, 67, 457, CHARACTER},
+    {CHARACTER, 0, 76, 458, CHARACTER},
+    {CHARACTER, 0, 65, 459, CHARACTER},
+    {CHARACTER, 0, 82, 460, CHARACTER},
+    {CHARACTER, 0, 69, 461, CHARACTER},
+    {CHARACTER, 0, 95, 462, CHARACTER},
     {CHARACTER, 51, 0, 0, CHARACTER},
-    {CHARACTER, 0, 84, 501, CHARACTER},
-    {CHARACTER, 0, 83, 447, CHARACTER},
-    {CHARACTER, 0, 76, 503, CHARACTER},
-    {CHARACTER, 0, 65, 504, CHARACTER},
-    {CHARACTER, 0, 83, 505, CHARACTER},
-    {CHARACTER, 0, 83, 506, CHARACTER},
-    {CHARACTER, 0, 73, 507, CHARACTER},
-    {CHARACTER, 0, 78, 508, CHARACTER},
-    {CHARACTER, 0, 70, 509, CHARACTER},
-    {CHARACTER, 0, 79, 510, CHARACTER},
-    {Q_CLASSINFO_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 78, 512, CHARACTER},
+    {CHARACTER, 0, 76, 464, CHARACTER},
+    {CHARACTER, 0, 65, 465, CHARACTER},
+    {CHARACTER, 0, 71, 466, CHARACTER},
+    {CHARACTER, 0, 83, 467, CHARACTER},
+    {Q_DECLARE_FLAGS_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 78, 469, CHARACTER},
+    {CHARACTER, 0, 84, 470, CHARACTER},
+    {CHARACTER, 0, 69, 471, CHARACTER},
+    {CHARACTER, 0, 82, 472, CHARACTER},
+    {CHARACTER, 0, 70, 473, CHARACTER},
+    {CHARACTER, 0, 65, 474, CHARACTER},
+    {CHARACTER, 0, 67, 475, CHARACTER},
+    {CHARACTER, 0, 69, 476, CHARACTER},
+    {Q_DECLARE_INTERFACE_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 69, 478, CHARACTER},
+    {CHARACTER, 0, 84, 479, CHARACTER},
+    {CHARACTER, 0, 65, 480, CHARACTER},
+    {CHARACTER, 0, 84, 481, CHARACTER},
+    {CHARACTER, 0, 89, 482, CHARACTER},
+    {CHARACTER, 0, 80, 483, CHARACTER},
+    {CHARACTER, 0, 69, 484, CHARACTER},
+    {Q_DECLARE_METATYPE_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 88, 486, CHARACTER},
+    {CHARACTER, 0, 84, 487, CHARACTER},
+    {CHARACTER, 0, 69, 488, CHARACTER},
+    {CHARACTER, 0, 78, 489, CHARACTER},
+    {CHARACTER, 0, 83, 490, CHARACTER},
+    {CHARACTER, 0, 73, 491, CHARACTER},
+    {CHARACTER, 0, 79, 492, CHARACTER},
+    {CHARACTER, 0, 78, 493, CHARACTER},
+    {CHARACTER, 0, 95, 494, CHARACTER},
+    {CHARACTER, 0, 73, 495, CHARACTER},
+    {CHARACTER, 0, 78, 496, CHARACTER},
+    {CHARACTER, 0, 84, 497, CHARACTER},
+    {CHARACTER, 0, 69, 498, CHARACTER},
+    {CHARACTER, 0, 82, 499, CHARACTER},
+    {CHARACTER, 0, 70, 500, CHARACTER},
+    {CHARACTER, 0, 65, 501, CHARACTER},
+    {CHARACTER, 0, 67, 502, CHARACTER},
+    {CHARACTER, 0, 69, 476, CHARACTER},
     {CHARACTER, 52, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 514, CHARACTER},
-    {CHARACTER, 0, 82, 515, CHARACTER},
-    {CHARACTER, 0, 70, 516, CHARACTER},
-    {CHARACTER, 0, 65, 517, CHARACTER},
-    {CHARACTER, 0, 67, 518, CHARACTER},
-    {CHARACTER, 0, 69, 519, CHARACTER},
-    {CHARACTER, 0, 83, 520, CHARACTER},
-    {Q_INTERFACES_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 108, 522, CHARACTER},
-    {CHARACTER, 0, 115, 523, CHARACTER},
-    {SIGNALS, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 111, 525, CHARACTER},
-    {CHARACTER, 0, 116, 526, CHARACTER},
-    {CHARACTER, 0, 115, 527, CHARACTER},
-    {SLOTS, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 71, 529, CHARACTER},
-    {CHARACTER, 0, 78, 530, CHARACTER},
-    {CHARACTER, 0, 65, 531, CHARACTER},
-    {CHARACTER, 0, 76, 532, CHARACTER},
-    {Q_SIGNAL_TOKEN, 0, 83, 533, CHARACTER},
-    {Q_SIGNALS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 535, CHARACTER},
-    {CHARACTER, 0, 84, 536, CHARACTER},
-    {Q_SLOT_TOKEN, 0, 83, 537, CHARACTER},
-    {Q_SLOTS_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 86, 539, CHARACTER},
-    {CHARACTER, 0, 65, 540, CHARACTER},
-    {CHARACTER, 0, 84, 541, CHARACTER},
-    {CHARACTER, 0, 69, 542, CHARACTER},
-    {CHARACTER, 0, 95, 543, CHARACTER},
+    {CHARACTER, 0, 84, 505, CHARACTER},
+    {CHARACTER, 0, 83, 451, CHARACTER},
+    {CHARACTER, 0, 76, 507, CHARACTER},
+    {CHARACTER, 0, 65, 508, CHARACTER},
+    {CHARACTER, 0, 83, 509, CHARACTER},
+    {CHARACTER, 0, 83, 510, CHARACTER},
+    {CHARACTER, 0, 73, 511, CHARACTER},
+    {CHARACTER, 0, 78, 512, CHARACTER},
+    {CHARACTER, 0, 70, 513, CHARACTER},
+    {CHARACTER, 0, 79, 514, CHARACTER},
+    {Q_CLASSINFO_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 78, 516, CHARACTER},
     {CHARACTER, 53, 0, 0, CHARACTER},
-    {CHARACTER, 0, 76, 545, CHARACTER},
-    {CHARACTER, 0, 79, 546, CHARACTER},
-    {CHARACTER, 0, 84, 547, CHARACTER},
+    {CHARACTER, 0, 69, 518, CHARACTER},
+    {CHARACTER, 0, 82, 519, CHARACTER},
+    {CHARACTER, 0, 70, 520, CHARACTER},
+    {CHARACTER, 0, 65, 521, CHARACTER},
+    {CHARACTER, 0, 67, 522, CHARACTER},
+    {CHARACTER, 0, 69, 523, CHARACTER},
+    {CHARACTER, 0, 83, 524, CHARACTER},
+    {Q_INTERFACES_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 108, 526, CHARACTER},
+    {CHARACTER, 0, 115, 527, CHARACTER},
+    {SIGNALS, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 111, 529, CHARACTER},
+    {CHARACTER, 0, 116, 530, CHARACTER},
+    {CHARACTER, 0, 115, 531, CHARACTER},
+    {SLOTS, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 71, 533, CHARACTER},
+    {CHARACTER, 0, 78, 534, CHARACTER},
+    {CHARACTER, 0, 65, 535, CHARACTER},
+    {CHARACTER, 0, 76, 536, CHARACTER},
+    {Q_SIGNAL_TOKEN, 0, 83, 537, CHARACTER},
+    {Q_SIGNALS_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 79, 539, CHARACTER},
+    {CHARACTER, 0, 84, 540, CHARACTER},
+    {Q_SLOT_TOKEN, 0, 83, 541, CHARACTER},
+    {Q_SLOTS_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 86, 543, CHARACTER},
+    {CHARACTER, 0, 65, 544, CHARACTER},
+    {CHARACTER, 0, 84, 545, CHARACTER},
+    {CHARACTER, 0, 69, 546, CHARACTER},
+    {CHARACTER, 0, 95, 547, CHARACTER},
+    {CHARACTER, 54, 0, 0, CHARACTER},
+    {CHARACTER, 0, 76, 549, CHARACTER},
+    {CHARACTER, 0, 79, 550, CHARACTER},
+    {CHARACTER, 0, 84, 551, CHARACTER},
     {Q_PRIVATE_SLOT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 549, CHARACTER},
-    {CHARACTER, 0, 67, 550, CHARACTER},
-    {CHARACTER, 0, 95, 551, CHARACTER},
-    {CHARACTER, 0, 67, 552, CHARACTER},
     {CHARACTER, 0, 79, 553, CHARACTER},
-    {CHARACTER, 0, 77, 554, CHARACTER},
-    {CHARACTER, 0, 80, 555, CHARACTER},
-    {CHARACTER, 0, 65, 556, CHARACTER},
-    {CHARACTER, 0, 84, 557, CHARACTER},
+    {CHARACTER, 0, 67, 554, CHARACTER},
+    {CHARACTER, 0, 95, 555, CHARACTER},
+    {CHARACTER, 0, 67, 556, CHARACTER},
+    {CHARACTER, 0, 79, 557, CHARACTER},
+    {CHARACTER, 0, 77, 558, CHARACTER},
+    {CHARACTER, 0, 80, 559, CHARACTER},
+    {CHARACTER, 0, 65, 560, CHARACTER},
+    {CHARACTER, 0, 84, 561, CHARACTER},
     {Q_MOC_COMPAT_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 559, CHARACTER},
-    {CHARACTER, 0, 75, 560, CHARACTER},
-    {CHARACTER, 0, 65, 561, CHARACTER},
-    {CHARACTER, 0, 66, 562, CHARACTER},
-    {CHARACTER, 0, 76, 563, CHARACTER},
-    {CHARACTER, 0, 69, 564, CHARACTER},
+    {CHARACTER, 0, 79, 563, CHARACTER},
+    {CHARACTER, 0, 75, 564, CHARACTER},
+    {CHARACTER, 0, 65, 565, CHARACTER},
+    {CHARACTER, 0, 66, 566, CHARACTER},
+    {CHARACTER, 0, 76, 567, CHARACTER},
+    {CHARACTER, 0, 69, 568, CHARACTER},
     {Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 82, 566, CHARACTER},
-    {CHARACTER, 0, 73, 567, CHARACTER},
-    {CHARACTER, 0, 80, 568, CHARACTER},
-    {CHARACTER, 0, 84, 569, CHARACTER},
-    {CHARACTER, 0, 65, 570, CHARACTER},
-    {CHARACTER, 0, 66, 571, CHARACTER},
-    {CHARACTER, 0, 76, 572, CHARACTER},
-    {CHARACTER, 0, 69, 573, CHARACTER},
+    {CHARACTER, 0, 82, 570, CHARACTER},
+    {CHARACTER, 0, 73, 571, CHARACTER},
+    {CHARACTER, 0, 80, 572, CHARACTER},
+    {CHARACTER, 0, 84, 573, CHARACTER},
+    {CHARACTER, 0, 65, 574, CHARACTER},
+    {CHARACTER, 0, 66, 575, CHARACTER},
+    {CHARACTER, 0, 76, 576, CHARACTER},
+    {CHARACTER, 0, 69, 577, CHARACTER},
     {Q_SCRIPTABLE_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 82, 575, CHARACTER},
-    {CHARACTER, 0, 79, 576, CHARACTER},
-    {CHARACTER, 0, 80, 577, CHARACTER},
-    {CHARACTER, 0, 69, 578, CHARACTER},
     {CHARACTER, 0, 82, 579, CHARACTER},
-    {CHARACTER, 0, 84, 580, CHARACTER},
-    {CHARACTER, 0, 89, 581, CHARACTER},
+    {CHARACTER, 0, 79, 580, CHARACTER},
+    {CHARACTER, 0, 80, 581, CHARACTER},
+    {CHARACTER, 0, 69, 582, CHARACTER},
+    {CHARACTER, 0, 82, 583, CHARACTER},
+    {CHARACTER, 0, 84, 584, CHARACTER},
+    {CHARACTER, 0, 89, 585, CHARACTER},
     {Q_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 86, 583, CHARACTER},
-    {CHARACTER, 0, 65, 584, CHARACTER},
-    {CHARACTER, 0, 84, 585, CHARACTER},
-    {CHARACTER, 0, 69, 586, CHARACTER},
-    {CHARACTER, 0, 95, 587, CHARACTER},
-    {CHARACTER, 0, 80, 588, CHARACTER},
-    {CHARACTER, 0, 82, 589, CHARACTER},
-    {CHARACTER, 0, 79, 590, CHARACTER},
-    {CHARACTER, 0, 80, 591, CHARACTER},
-    {CHARACTER, 0, 69, 592, CHARACTER},
+    {CHARACTER, 0, 86, 587, CHARACTER},
+    {CHARACTER, 0, 65, 588, CHARACTER},
+    {CHARACTER, 0, 84, 589, CHARACTER},
+    {CHARACTER, 0, 69, 590, CHARACTER},
+    {CHARACTER, 0, 95, 591, CHARACTER},
+    {CHARACTER, 0, 80, 592, CHARACTER},
     {CHARACTER, 0, 82, 593, CHARACTER},
-    {CHARACTER, 0, 84, 594, CHARACTER},
-    {CHARACTER, 0, 89, 595, CHARACTER},
+    {CHARACTER, 0, 79, 594, CHARACTER},
+    {CHARACTER, 0, 80, 595, CHARACTER},
+    {CHARACTER, 0, 69, 596, CHARACTER},
+    {CHARACTER, 0, 82, 597, CHARACTER},
+    {CHARACTER, 0, 84, 598, CHARACTER},
+    {CHARACTER, 0, 89, 599, CHARACTER},
     {QT_ANONYMOUS_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 69, 597, CHARACTER},
-    {CHARACTER, 0, 86, 598, CHARACTER},
-    {CHARACTER, 0, 73, 599, CHARACTER},
-    {CHARACTER, 0, 83, 600, CHARACTER},
-    {CHARACTER, 0, 73, 601, CHARACTER},
-    {CHARACTER, 0, 79, 602, CHARACTER},
-    {CHARACTER, 0, 78, 603, CHARACTER},
+    {CHARACTER, 0, 69, 601, CHARACTER},
+    {CHARACTER, 0, 86, 602, CHARACTER},
+    {CHARACTER, 0, 73, 603, CHARACTER},
+    {CHARACTER, 0, 83, 604, CHARACTER},
+    {CHARACTER, 0, 73, 605, CHARACTER},
+    {CHARACTER, 0, 79, 606, CHARACTER},
+    {CHARACTER, 0, 78, 607, CHARACTER},
     {Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
-    {CHARACTER, 0, 79, 605, CHARACTER},
-    {CHARACTER, 0, 67, 606, CHARACTER},
-    {CHARACTER, 0, 95, 607, CHARACTER},
-    {CHARACTER, 0, 73, 608, CHARACTER},
-    {CHARACTER, 0, 78, 609, CHARACTER},
+    {CHARACTER, 0, 79, 609, CHARACTER},
     {CHARACTER, 0, 67, 610, CHARACTER},
-    {CHARACTER, 0, 76, 611, CHARACTER},
-    {CHARACTER, 0, 85, 612, CHARACTER},
-    {CHARACTER, 0, 68, 613, CHARACTER},
-    {CHARACTER, 0, 69, 614, CHARACTER},
+    {CHARACTER, 0, 95, 611, CHARACTER},
+    {CHARACTER, 0, 73, 612, CHARACTER},
+    {CHARACTER, 0, 78, 613, CHARACTER},
+    {CHARACTER, 0, 67, 614, CHARACTER},
+    {CHARACTER, 0, 76, 615, CHARACTER},
+    {CHARACTER, 0, 85, 616, CHARACTER},
+    {CHARACTER, 0, 68, 617, CHARACTER},
+    {CHARACTER, 0, 69, 618, CHARACTER},
     {Q_MOC_INCLUDE_TOKEN, 0, 0, 0, CHARACTER},
     {NEWLINE, 0, 0, 0, NOTOKEN},
     {QUOTE, 0, 0, 0, NOTOKEN},
     {SINGLEQUOTE, 0, 0, 0, NOTOKEN},
     {WHITESPACE, 0, 0, 0, NOTOKEN},
-    {HASH, 0, 35, 620, HASH},
+    {HASH, 0, 35, 624, HASH},
     {PP_HASHHASH, 0, 0, 0, NOTOKEN},
     {BACKSLASH, 0, 0, 0, NOTOKEN},
     {CPP_COMMENT, 0, 0, 0, NOTOKEN},
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index d4b6286b10c..73c5bdd9cc1 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -527,7 +527,7 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
 
 bool Moc::testForFunctionModifiers(FunctionDef *def)
 {
-    return test(EXPLICIT) || test(INLINE) ||
+    return test(EXPLICIT) || test(INLINE) || test(CONSTEXPR) ||
             (test(STATIC) && (def->isStatic = true)) ||
             (test(VIRTUAL) && (def->isVirtual = true));
 }
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index 34c6dfafa50..95ef385a797 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE
     F(EXPLICIT) \
     F(STATIC) \
     F(CONST) \
+    F(CONSTEXPR) \
     F(VOLATILE) \
     F(OPERATOR) \
     F(SIZEOF) \
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index a6c85af9f13..b98914d7177 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -121,6 +121,7 @@ static const Keyword keywords[] = {
     { "explicit", "EXPLICIT" },
     { "static", "STATIC" },
     { "const", "CONST" },
+    { "constexpr", "CONSTEXPR" },
     { "volatile", "VOLATILE" },
     { "operator", "OPERATOR" },
     { "sizeof", "SIZEOF" },
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 583318d8cf4..8bad1965a1c 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -675,6 +675,7 @@ public:
     { return *this; }
     Q_INVOKABLE const QObject& myInvokableReturningConstRef() const
     { return *this; }
+    Q_INVOKABLE static int inline constexpr invokableWithConstexpr() { return 42; }
 
 
     // that one however should be fine