Add support for C++ accessible typed parameters and return types in qml functions

These can be declared using the new typescript-like syntax and using
type names that are also used for signal parameters and property types.
This merely affects their signature on the C++ side and allows the
corresponding invocation.

Change-Id: Icaed4ee0dc7aa71330f99d96e073a2a63d409bbe
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index a207ea7e86..247145ac0c 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -453,14 +453,23 @@ inline QQmlJS::DiagnosticMessage QQmlPropertyCacheCreator<ObjectContainer>::crea
         // protect against overriding change signals or methods with properties.
 
         QList<QByteArray> parameterNames;
+        QVector<int> parameterTypes;
         auto formal = function->formalsBegin();
         auto end = function->formalsEnd();
         for ( ; formal != end; ++formal) {
             flags.hasArguments = true;
-            parameterNames << stringAt(*formal).toUtf8();
+            parameterNames << stringAt(formal->nameIndex).toUtf8();
+            int type = metaTypeForParameter(formal->type);
+            if (type == QMetaType::UnknownType)
+                type = QMetaType::QVariant;
+            parameterTypes << type;
         }
 
-        cache->appendMethod(slotName, flags, effectiveMethodIndex++, parameterNames);
+        int returnType = metaTypeForParameter(function->returnType);
+        if (returnType == QMetaType::UnknownType)
+            returnType = QMetaType::QVariant;
+
+        cache->appendMethod(slotName, flags, effectiveMethodIndex++, returnType, parameterNames, parameterTypes);
     }