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

diff --git a/src/qml/qml/qqmlmetaobject.cpp b/src/qml/qml/qqmlmetaobject.cpp
index 84a906b4f9..89c08f3841 100644
--- a/src/qml/qml/qqmlmetaobject.cpp
+++ b/src/qml/qml/qqmlmetaobject.cpp
@@ -139,32 +139,32 @@ int QQmlMetaObject::methodReturnType(const QQmlPropertyData &data, QByteArray *u
 {
     Q_ASSERT(_m && data.coreIndex() >= 0);
 
-    int type = data.propType();
+    QMetaType type = data.propType();
 
     const char *propTypeName = nullptr;
 
-    if (type == QMetaType::UnknownType) {
+    if (!type.isValid()) {
         // Find the return type name from the method info
         QMetaMethod m = _m->method(data.coreIndex());
 
-        type = m.returnType();
+        type = m.returnMetaType();
         propTypeName = m.typeName();
     }
 
-    if (QMetaType(type).sizeOf() <= qsizetype(sizeof(int))) {
-        if (QMetaType(type).flags() & QMetaType::IsEnumeration)
+    if (type.sizeOf() <= qsizetype(sizeof(int))) {
+        if (type.flags() & QMetaType::IsEnumeration)
             return QMetaType::Int;
 
         if (isNamedEnumerator(_m, propTypeName))
             return QMetaType::Int;
 
-        if (type == QMetaType::UnknownType) {
+        if (!type.isValid()) {
             if (unknownTypeError)
                 *unknownTypeError = propTypeName;
         }
     } // else we know that it's a known type, as sizeOf(UnknownType) == 0
 
-    return type;
+    return type.id();
 }
 
 int *QQmlMetaObject::methodParameterTypes(int index, ArgTypeStorage *argStorage,