diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-18 10:03:18 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-21 12:47:54 +0200 |
| commit | 16cbcc606d431456ef5ab6783705a37d27776207 (patch) | |
| tree | 6e4727307e75beadc3c9a532c29ffcd93f9a7a00 /src/qml/qml/qqmltypecompiler.cpp | |
| parent | c23f85e159245f4f01f095bbb50dd01df4df2b62 (diff) | |
Add support for primitive self-references in composite types
This has been long missing and will also help with the implementation of
inline components and the referenced bugs.
Done-with: Fabian Kosmale <fabian.kosmale@qt.io>
Task-number: QTBUG-41087
Task-number: QTBUG-35910
Change-Id: Ia42a8f9808ece543f8ce2314b3352507fab22c62
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypecompiler.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypecompiler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index 9ff0e3fb9e..7b4cf1a580 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -81,7 +81,7 @@ QQmlRefPointer<QV4::ExecutableCompilationUnit> QQmlTypeCompiler::compile() { QQmlPropertyCacheCreator<QQmlTypeCompiler> propertyCacheBuilder(&m_propertyCaches, &pendingGroupPropertyBindings, - engine, this, imports()); + engine, this, imports(), typeData->typeClassName()); QQmlJS::DiagnosticMessage error = propertyCacheBuilder.buildMetaObjects(); if (error.isValid()) { recordError(error); @@ -279,6 +279,11 @@ void QQmlTypeCompiler::addImport(const QString &module, const QString &qualifier document->imports.append(import); } +QQmlMetaType::CompositeMetaTypeIds QQmlTypeCompiler::typeIds() const +{ + return typeData->typeIds(); +} + QQmlCompilePass::QQmlCompilePass(QQmlTypeCompiler *typeCompiler) : compiler(typeCompiler) { |