MetaObject: store the QMetaType of the properties

Change-Id: I563e7232b70e94de4184f2c23a581319313dcf5c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index d02708540a..cd5caad0a7 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -1196,6 +1196,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
         if (!relocatable) meta->d.superdata = d->superClass;
         meta->d.relatedMetaObjects = nullptr;
         meta->d.extradata = nullptr;
+        meta->d.metaTypes = nullptr;
         meta->d.static_metacall = d->staticMetacallFunction;
     }
 
@@ -1474,6 +1475,20 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
         size += sizeof(SuperData) * (d->relatedMetaObjects.size() + 1);
     }
 
+    if (d->properties.size() > 0) {
+        ALIGN(size, QtPrivate::QMetaTypeInterface *);
+        auto types = reinterpret_cast<QtPrivate::QMetaTypeInterface **>(buf + size);
+        if (buf) {
+            meta->d.metaTypes = types;
+            for (const auto &prop : d->properties) {
+                QMetaType mt(QMetaType::type(prop.type));
+                *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
+                types++;
+            }
+        }
+        size += sizeof(QMetaType) * d->properties.size();
+    }
+
     // Align the final size and return it.
     ALIGN(size, void *);
     Q_ASSERT(!buf || size == expectedSize);