From 535adf8d9f6d26d4e9598a9276f23f938fcc7753 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 28 Oct 2020 13:45:17 +0100
Subject: Formalize declaration of varargs in builtins.qmltypes

varargs are a special non-exported type.

Change-Id: I2cd00d197ee5b4976e683cfe91dc0561a7186541
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/imports/builtins/builtins.qmltypes | 62 +++++++++++-----------------------
 1 file changed, 19 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index a7975dc5ea..5a21af6868 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -15,6 +15,11 @@ Module {
         exportMetaObjectRevisions: [256]
     }
 
+    Component {
+        name: "varargs"
+        accessSemantics: "value"
+    }
+
     Component {
         name: "QObject"
         accessSemantics: "reference"
@@ -519,16 +524,9 @@ Module {
             type: "double"
 
             Parameter {
-                name: "value1"
-                type: "double"
-            }
-
-            Parameter {
-                name: "value2"
-                type: "double"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
@@ -602,16 +600,9 @@ Module {
             type: "NumberPrototype"
 
             Parameter {
-                name: "value1"
-                type: "NumberPrototype"
-            }
-
-            Parameter {
-                name: "value2"
-                type: "NumberPrototype"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
@@ -619,16 +610,9 @@ Module {
             type: "NumberPrototype"
 
             Parameter {
-                name: "value1"
-                type: "NumberPrototype"
-            }
-
-            Parameter {
-                name: "value2"
-                type: "NumberPrototype"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
@@ -810,11 +794,9 @@ Module {
             type: "string"
 
             Parameter {
-                name: "codeUnits"
-                type: "int"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
@@ -822,11 +804,9 @@ Module {
             type: "string"
 
             Parameter {
-                name: "codeUnits"
-                type: "int"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
@@ -835,15 +815,13 @@ Module {
 
             Parameter {
                 name: "template"
-                type: "string"
+                type: "var"
             }
 
             Parameter {
                 name: "substitutions"
-                type: "list"
+                type: "varargs"
             }
-            // vararg
-
         }
 
     }
@@ -889,11 +867,9 @@ Module {
             type: "string"
 
             Parameter {
-                name: "args"
-                type: "string"
+                name: "arguments"
+                type: "varargs"
             }
-            // vararg
-
         }
 
         Method {
-- 
cgit v1.2.3