diff options
Diffstat (limited to 'src/qml/qml/qqmlmetatypedata_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatypedata_p.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h index 60b76137d1..8863bd1089 100644 --- a/src/qml/qml/qqmlmetatypedata_p.h +++ b/src/qml/qml/qqmlmetatypedata_p.h @@ -36,10 +36,10 @@ struct QQmlMetaTypeData typedef QHash<int, QQmlTypePrivate *> Ids; Ids idToType; - using Names = QMultiHash<QHashedString, QQmlTypePrivate *>; + using Names = QMultiHash<QHashedString, const QQmlTypePrivate *>; Names nameToType; - typedef QHash<QUrl, QQmlTypePrivate *> Files; //For file imported composite types only + typedef QHash<QUrl, const QQmlTypePrivate *> Files; //For file imported composite types only Files urlToType; Files urlToNonFileImportType; // For non-file imported composite and composite // singleton types. This way we can locate any @@ -49,7 +49,11 @@ struct QQmlMetaTypeData MetaObjects metaObjectToType; QVector<QHash<QTypeRevision, QQmlPropertyCache::ConstPtr>> typePropertyCaches; QHash<int, QQmlValueType *> metaTypeToValueType; - QHash<const QtPrivate::QMetaTypeInterface *, QV4::ExecutableCompilationUnit *> compositeTypes; + + using CompositeTypes = QHash<const QtPrivate::QMetaTypeInterface *, + QQmlRefPointer<QV4::CompiledData::CompilationUnit>>; + CompositeTypes compositeTypes; + QHash<QUrl, QQmlType> inlineComponentTypes; struct VersionedUri { VersionedUri() = default; |