diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-15 14:47:35 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-23 15:58:10 +0100 |
commit | 684f9df7849bc79f1f02a60844fb43c7a3927d2f (patch) | |
tree | 531be4d102388395e4ddd2d14f38a679e15c283d /src/qml/qml/qqmltypedata_p.h | |
parent | 020a6e67766595351bcf911e965b26952a7c81b8 (diff) |
Long live QML inline components
[ChangeLog][QtQml] It is now possible to declare new QML components in
a QML file via the component keyword. They can be used just as if they
were declared in another file, with the only difference that the type
name needs to be prefixed with the name of the containing type outside
of the file were the inline component has been declared.
Notably, inline components are not closures: In the following
example, the output would be 42
// MyItem.qml
Item {
property int i: 33
component IC: Item {
Component.onCompleted: console.log(i)
}
}
// user.qml
Item {
property int i: 42
MyItem.IC {}
}
Fixes: QTBUG-79382
Change-Id: I6a5ffc43f093a76323f435cfee9bab217781b8f5
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypedata_p.h')
-rw-r--r-- | src/qml/qml/qqmltypedata_p.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/qml/qml/qqmltypedata_p.h b/src/qml/qml/qqmltypedata_p.h index 53e78e06d7..d894090b36 100644 --- a/src/qml/qml/qqmltypedata_p.h +++ b/src/qml/qml/qqmltypedata_p.h @@ -86,6 +86,8 @@ private: friend class QQmlTypeLoader; QQmlTypeData(const QUrl &, QQmlTypeLoader *); + template<typename Container> + void setCompileUnit(const Container &container); public: ~QQmlTypeData() override; @@ -93,6 +95,7 @@ public: const QList<ScriptReference> &resolvedScripts() const; QV4::ExecutableCompilationUnit *compilationUnit() const; + QV4::ExecutableCompilationUnit *compilationUnitForInlineComponent(unsigned int icObjectId) const; // Used by QQmlComponent to get notifications struct TypeDataCallback { @@ -103,7 +106,7 @@ public: void registerCallback(TypeDataCallback *); void unregisterCallback(TypeDataCallback *); - QQmlMetaType::CompositeMetaTypeIds typeIds() const; + CompositeMetaTypeIds typeIds(int objectId = 0) const; QByteArray typeClassName() const { return m_typeClassName; } protected: @@ -155,10 +158,15 @@ private: bool m_typesResolved:1; // Used for self-referencing types, otherwise -1. - QQmlMetaType::CompositeMetaTypeIds m_typeIds; + CompositeMetaTypeIds m_typeIds; QByteArray m_typeClassName; // used for meta-object later - QQmlRefPointer<QV4::ExecutableCompilationUnit> m_compiledData; + using ExecutableCompilationUnitPtr = QQmlRefPointer<QV4::ExecutableCompilationUnit>; + + QHash<int, InlineComponentData> m_inlineComponentData; + + ExecutableCompilationUnitPtr m_compiledData; + QHash<int, ExecutableCompilationUnitPtr> m_inlineComponentToCompiledData; QList<TypeDataCallback *> m_callbacks; |