Centralize property & signal parameter type handling at compilation time

Collect all that code in the Parameter class, which allows for future
re-use for function parameters and return types.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index b29f14ff4a..54455fb560 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -414,12 +414,13 @@ inline QQmlJS::DiagnosticMessage QQmlPropertyCacheCreator<ObjectContainer>::crea
             auto end = s->parametersEnd();
             for ( ; param != end; ++param, ++i) {
                 names.append(stringAt(param->nameIndex).toUtf8());
-                if (param->indexIsBuiltinType) {
+                const auto &type = param->type;
+                if (type.indexIsBuiltinType) {
                     // built-in type
-                    paramTypes[i + 1] = metaTypeForPropertyType(static_cast<QV4::CompiledData::BuiltinType>(int(param->typeNameIndexOrBuiltinType)));
+                    paramTypes[i + 1] = metaTypeForPropertyType(static_cast<QV4::CompiledData::BuiltinType>(int(type.typeNameIndexOrBuiltinType)));
                 } else {
                     // lazily resolved type
-                    const QString customTypeName = stringAt(param->typeNameIndexOrBuiltinType);
+                    const QString customTypeName = stringAt(type.typeNameIndexOrBuiltinType);
                     QQmlType qmltype;
                     if (!imports->resolveType(customTypeName, &qmltype, nullptr, nullptr, nullptr))
                         return qQmlCompileError(s->location, QQmlPropertyCacheCreatorBase::tr("Invalid signal parameter type: %1").arg(customTypeName));