QML engine: Use QMetaType instead of metatype-id in propertydata

We don't want to convert back and forth between QMetaTypes and ids. This
change is the first step towards using QMetaType directly everywhere.
By reordering the members of QQmlPropertyData to avoid a gap caused by
alignment, we can replace the typeid int with a QMetaType without
requiring more space.
There are still a few places left using metatype ids, notably the value
type logic.

Task-number: QTBUG-82931
Change-Id: Ic38f38d10c71ed20655877976c9cb5ee3cbe2d77
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 2379f393aa..2ae9707c22 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -250,7 +250,7 @@ void QQmlVMEMetaObjectEndpoint::tryConnect()
             if (pd && valueTypeIndex != -1 && !QQmlValueTypeFactory::valueType(pd->propType())) {
                 // deep alias
                 QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(metaObject->compilationUnit->engine->qmlEngine());
-                auto const *newPropertyCache = enginePriv->propertyCacheForType(pd->propType());
+                auto const *newPropertyCache = enginePriv->propertyCacheForType(pd->propType().id());
                 void *argv[1] = { &target };
                 QMetaObject::metacall(target, QMetaObject::ReadProperty, coreIndex, argv);
                 Q_ASSERT(newPropertyCache);
@@ -321,7 +321,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a)
 
             const int valueIndex = vi->m_propertyIndex.valueTypeIndex();
             const QQmlData *data = QQmlData::get(object);
-            const int type = data->propertyCache->property(id)->propType();
+            const int type = data->propertyCache->property(id)->propType().id();
 
             if (type != QMetaType::UnknownType) {
                 if (valueIndex != -1) {
@@ -700,7 +700,7 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                         ? nullptr
                         : QQmlEnginePrivate::get(ctxt->engine());
 
-                const int fallbackMetaType = QQmlPropertyCacheCreatorBase::metaTypeForPropertyType(t);
+                const int fallbackMetaType = QQmlPropertyCacheCreatorBase::metaTypeForPropertyType(t).id();
 
                 if (c == QMetaObject::ReadProperty) {
                     switch (t) {
@@ -930,7 +930,7 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                     const QQmlPropertyData *pd = targetDData->propertyCache->property(coreIndex);
                     // Value type property or deep alias
                     QQmlGadgetPtrWrapper *valueType = QQmlGadgetPtrWrapper::instance(
-                                ctxt->engine(), pd->propType());
+                                ctxt->engine(), pd->propType().id());
                     if (valueType) {
                         valueType->read(target, coreIndex);
                         int rv = QMetaObject::metacall(valueType, c, valueTypePropertyIndex, a);
@@ -1007,24 +1007,24 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                     jsCallData->args[ii] = scope.engine->metaTypeToJS(arguments->arguments[ii + 1], a[ii + 1]);
                 }
 
-                const int returnType = methodData->propType();
+                const QMetaType returnType = methodData->propType();
                 QV4::ScopedValue result(scope, function->call(jsCallData));
                 if (scope.hasException()) {
                     QQmlError error = scope.engine->catchExceptionAsQmlError();
                     if (error.isValid())
                         ep->warning(error);
                     if (a[0]) {
-                        QMetaType(returnType).destruct(a[0]);
-                        QMetaType(returnType).construct(a[0], nullptr);
+                        returnType.destruct(a[0]);
+                        returnType.construct(a[0], nullptr);
                     }
                 } else {
                     if (a[0]) {
                         // When the return type is QVariant, JS objects are to be returned as QJSValue wrapped in
                         // QVariant.
-                        if (returnType == QMetaType::QVariant)
+                        if (returnType == QMetaType::fromType<QVariant>())
                             *(QVariant *)a[0] = scope.engine->toVariant(result, 0);
                         else
-                            scope.engine->metaTypeFromJS(result, returnType, a[0]);
+                            scope.engine->metaTypeFromJS(result, returnType.id(), a[0]);
                     }
                 }