Reduce size of QQmlValueType

QMetaType exposes the type id it holds, so QQmlValueType do not have to
keep a duplicate.

Change-Id: I4491744b9f7c1e447cd21466f9d71b4007fdfa06
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 2b21591017..e92488f9f6 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -191,7 +191,6 @@ void QQmlValueTypeFactory::registerValueTypes(const char *uri, int versionMajor,
 
 QQmlValueType::QQmlValueType(int typeId, const QMetaObject *gadgetMetaObject)
     : gadgetPtr(QMetaType::create(typeId))
-    , typeId(typeId)
     , metaType(typeId)
 {
     QObjectPrivate *op = QObjectPrivate::get(this);
@@ -230,12 +229,12 @@ void QQmlValueType::write(QObject *obj, int idx, QQmlPropertyData::WriteFlags fl
 QVariant QQmlValueType::value()
 {
     Q_ASSERT(gadgetPtr);
-    return QVariant(typeId, gadgetPtr);
+    return QVariant(metaType.id(), gadgetPtr);
 }
 
 void QQmlValueType::setValue(const QVariant &value)
 {
-    Q_ASSERT(typeId == value.userType());
+    Q_ASSERT(metaType.id() == value.userType());
     metaType.destruct(gadgetPtr);
     metaType.construct(gadgetPtr, value.constData());
 }