diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-11-25 11:05:10 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-11-29 16:41:21 +0100 |
| commit | 6d5f0aea9e29cd4710adc1d8f9d58954473a85fa (patch) | |
| tree | 136a353357b5148d8dc721f87732d676be65df2b /src/qmlcompiler/qqmljsstorageinitializer.cpp | |
| parent | 804d6ceec11e687e4fa821a2b6ceb4223597d0ab (diff) | |
QmlCompiler: Remove QQmlJSTypeResolver::trackedType()
We create a new QQmlJSRegisterContent in all the cases where it's used
anyway.
Task-number: QTBUG-124670
Change-Id: I4315b0485569c2a7fb77a78ab9d25f88d2371d96
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsstorageinitializer.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsstorageinitializer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qmlcompiler/qqmljsstorageinitializer.cpp b/src/qmlcompiler/qqmljsstorageinitializer.cpp index 04ba64a647..96a44c9eea 100644 --- a/src/qmlcompiler/qqmljsstorageinitializer.cpp +++ b/src/qmlcompiler/qqmljsstorageinitializer.cpp @@ -23,7 +23,7 @@ QQmlJSCompilePass::BlocksAndAnnotations QQmlJSStorageInitializer::run(Function * if (QQmlJSRegisterContent &returnType = function->returnType; returnType.isValid()) { if (const QQmlJSScope::ConstPtr stored = m_typeResolver->storedType(returnType.containedType())) { - returnType = m_pool->storedIn(returnType, m_typeResolver->trackedType(stored)); + returnType = m_pool->storedIn(returnType, stored); } else { addError(QStringLiteral("Cannot store the return type %1.") .arg(returnType.containedType()->internalName())); @@ -38,8 +38,7 @@ QQmlJSCompilePass::BlocksAndAnnotations QQmlJSStorageInitializer::run(Function * const QQmlJSRegisterContent original = m_typeResolver->original(content); const QQmlJSScope::ConstPtr originalStored = m_typeResolver->storedType(original.containedType()); - const QQmlJSScope::ConstPtr originalTracked = m_typeResolver->trackedType(originalStored); - content = m_pool->storedIn(content, originalTracked); + content = m_pool->storedIn(content, originalStored); const QQmlJSScope::ConstPtr adjustedStored = m_typeResolver->storedType(content.containedType()); |