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>

2 files changed, 29 insertions, 0 deletions

diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp
index 4f70bf0004..700c191499 100644
--- a/src/qml/parser/qqmljsast.cpp
+++ b/src/qml/parser/qqmljsast.cpp
@@ -1511,6 +1511,31 @@ void UiVersionSpecifier::accept0(Visitor *visitor)
     }
     visitor->endVisit(this);
 }
+
+QString Type::toString() const
+{
+    QString result;
+    toString(&result);
+    return result;
+}
+
+void Type::toString(QString *out) const
+{
+    for (QQmlJS::AST::UiQualifiedId *it = typeId; it; it = it->next) {
+        out->append(it->name);
+
+        if (it->next)
+            out->append(QLatin1Char('.'));
+    }
+
+    if (typeArguments) {
+        out->append(QLatin1Char('<'));
+        if (auto subType = static_cast<TypeArgumentList*>(typeArguments)->typeId)
+            subType->toString(out);
+        out->append(QLatin1Char('>'));
+    };
+}
+
 } } // namespace QQmlJS::AST
 
 QT_END_NAMESPACE
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index da8d0bcd8d..ea854c3754 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -364,6 +364,9 @@ public:
     SourceLocation lastSourceLocation() const override
     { return typeArguments ? typeArguments->lastSourceLocation() : typeId->lastSourceLocation(); }
 
+    QString toString() const;
+    void toString(QString *out) const;
+
 // attributes
     UiQualifiedId *typeId;
     Node *typeArguments; // TypeArgumentList
@@ -838,6 +841,7 @@ struct QML_PARSER_EXPORT BoundName
         : id(id), typeAnnotation(typeAnnotation)
     {}
     BoundName() = default;
+    QString typeName() const { return typeAnnotation ? typeAnnotation->type->toString() : QString(); }
 };
 
 struct BoundNames : public QVector<BoundName>