aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlpropertycachecreator_p.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2020-01-07 11:37:01 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-03-09 10:54:37 +0100
commitf3dccc334f01d088fcdf1c2016c8153fe6154b61 (patch)
tree7b8148f8ba1dcf53fc9f56a46fa42e810b699316 /src/qml/qml/qqmlpropertycachecreator_p.h
parentf65c0e7190c4f2ebcadc963cf0647c71de26f3bb (diff)
Adapt to the the new QMetaType change
Fixes: QTBUG-82453 Change-Id: I7e5682945a07c3af183becd3947a69568f139d16 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertycachecreator_p.h')
-rw-r--r--src/qml/qml/qqmlpropertycachecreator_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index 2d99ea9fd5..cadbfdd481 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -591,15 +591,15 @@ inline QQmlError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObject(int
}
if (p->isList) {
- propertyType = typeIds.listId;
+ propertyType = typeIds.listId.id();
} else {
- propertyType = typeIds.id;
+ propertyType = typeIds.id.id();
}
} else {
if (p->isList) {
- propertyType = qmltype.qListTypeId();
+ propertyType = qmltype.qListTypeId().id();
} else {
- propertyType = qmltype.typeId();
+ propertyType = qmltype.typeId().id();
propertyTypeVersion = qmltype.version();
}
}
@@ -647,10 +647,10 @@ inline int QQmlPropertyCacheCreator<ObjectContainer>::metaTypeForParameter(const
return QMetaType::UnknownType;
if (!qmltype.isComposite())
- return qmltype.typeId();
+ return qmltype.typeId().id();
if (selfReference)
- return objectContainer->typeIdsForComponent().id;
+ return objectContainer->typeIdsForComponent().id.id();
QQmlRefPointer<QQmlTypeData> tdata = enginePrivate->typeLoader.getType(qmltype.sourceUrl());
Q_ASSERT(tdata);
@@ -658,7 +658,7 @@ inline int QQmlPropertyCacheCreator<ObjectContainer>::metaTypeForParameter(const
auto compilationUnit = tdata->compilationUnit();
- return compilationUnit->metaTypeId;
+ return compilationUnit->metaTypeId.id();
}
template <typename ObjectContainer>
@@ -840,9 +840,9 @@ inline QQmlError QQmlPropertyCacheAliasCreator<ObjectContainer>::propertyDataFor
}
if (typeRef->type.isValid())
- *type = typeRef->type.typeId();
+ *type = typeRef->type.typeId().id();
else
- *type = typeRef->compilationUnit->metaTypeId;
+ *type = typeRef->compilationUnit->metaTypeId.id();
*version = typeRef->version;