Reduce the size of signal parameters in qml cache data

We can reduce the distinction between a built-in type or a custom type
down to a single bit.

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

1 files changed, 3 insertions, 4 deletions

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