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, 3 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp
index 8c01c81e7d..82cad8eba8 100644
--- a/src/qml/qml/qqmlirloader.cpp
+++ b/src/qml/qml/qqmlirloader.cpp
@@ -188,11 +188,12 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali
         f->index = functionIndices.count() - 1;
         f->location = compiledFunction->location;
         f->nameIndex = compiledFunction->nameIndex;
+        f->returnType = compiledFunction->returnType;
 
         f->formals.allocate(pool, int(compiledFunction->nFormals));
-        const quint32_le *formalNameIdx = compiledFunction->formalsTable();
+        const QV4::CompiledData::Parameter *formalNameIdx = compiledFunction->formalsTable();
         for (uint i = 0; i < compiledFunction->nFormals; ++i, ++formalNameIdx)
-            f->formals[i] = *formalNameIdx;
+            *static_cast<QV4::CompiledData::Parameter*>(&f->formals[i]) = *formalNameIdx;
 
         object->functions->append(f);
     }