moc: Output "isConst" attribute for methods in JSON

We need it to decide whether to generate write-back operations when compiling method calls on QML value types to C++. Task-number: QTBUG-127174 Change-Id: I63d3c2fbbbd463451cee57ddf33fa42d21335ac6 Reviewed-by: Thiago Macieira <[email protected]>
qt · Nov 15, 2024 · 94cbd20 · 94cbd20
1 parent b0b278d
commit 94cbd20
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
@@ -2099,6 +2099,8 @@ QJsonObject FunctionDef::toJson(int index) const
     if (!tag.isEmpty())
         fdef["tag"_L1] = QString::fromUtf8(tag);
     fdef["returnType"_L1] = QString::fromUtf8(normalizedType);
+    if (isConst)
+        fdef["isConst"_L1] = true;
 
     QJsonArray args;
     for (const ArgumentDef &arg: arguments)

diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json
@@ -331,12 +331,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -369,12 +371,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -407,12 +411,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -445,12 +451,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -483,12 +491,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -521,12 +531,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -559,12 +571,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -597,12 +611,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -635,12 +651,14 @@
                     {
                         "access": "private",
                         "index": 2,
+                        "isConst": true,
                         "name": "pureSlot2",
                         "returnType": "void"
                     },
                     {
                         "access": "private",
                         "index": 3,
+                        "isConst": true,
                         "name": "pureSlot3",
                         "returnType": "void"
                     }
@@ -835,6 +853,7 @@
                     {
                         "access": "public",
                         "index": 5,
+                        "isConst": true,
                         "name": "constConstRefReturn",
                         "returnType": "void"
                     }
@@ -2149,6 +2168,7 @@
                     {
                         "access": "public",
                         "index": 0,
+                        "isConst": true,
                         "name": "foo",
                         "returnType": "const char*"
                     }