diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 14:10:41 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-28 13:49:08 +0200 |
commit | 8248b5a485a2b8885442d6511906526548d9d07e (patch) | |
tree | 07d17281483f54fcbe28ed5a1add80ae0313e381 /src/qml/qml/qqmlpropertycachecreator_p.h | |
parent | 43a532deffce7ee8c273dbff19c1b0ca941e636d (diff) |
Always group the metaType and listType together
They are always created and destroyed together, so grouping
them makes the required memory management of them easier.
Change-Id: Ia1980f31f9bdff6a1accd229bc8380ae153edf67
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h index 5c9e806a4e..626b274c2f 100644 --- a/src/qml/qml/qqmlpropertycachecreator_p.h +++ b/src/qml/qml/qqmlpropertycachecreator_p.h @@ -649,7 +649,7 @@ inline int QQmlPropertyCacheCreator<ObjectContainer>::metaTypeForParameter(const auto compilationUnit = tdata->compilationUnit(); - return compilationUnit->metaTypeId.id(); + return compilationUnit->typeIds.id.id(); } template <typename ObjectContainer> @@ -834,7 +834,7 @@ inline QQmlError QQmlPropertyCacheAliasCreator<ObjectContainer>::propertyDataFor if (referencedType.isValid()) *type = referencedType.typeId().id(); else - *type = typeRef->compilationUnit()->metaTypeId.id(); + *type = typeRef->compilationUnit()->typeIds.id.id(); *version = typeRef->version(); |