diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/cmake/QDocConfiguration.cmake qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/cmake/QDocConfiguration.cmake --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/cmake/QDocConfiguration.cmake 2026-04-02 17:22:21.000000000 -0500 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/cmake/QDocConfiguration.cmake 2026-04-04 16:21:35.532381107 -0500 @@ -8,7 +8,7 @@ # List of explicitly supported Clang versions for QDoc set(QDOC_SUPPORTED_CLANG_VERSIONS - "21.1" "20.1" "19.1" "18.1" "17.0.6" + "22.1" "21.1" "20.1" "19.1" "18.1" "17.0.6" ) # Check if user explicitly disabled QDoc via -no-feature-qdoc diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h 2026-04-02 17:22:21.000000000 -0500 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h 2026-04-04 16:21:45.129248013 -0500 @@ -36,6 +36,494 @@ namespace TypeName { +#if CLANG_VERSION_MAJOR >= 22 + +// ========================================================================= +// LLVM 22+ implementation +// +// Adapted from upstream clang/lib/AST/QualTypeNames.cpp (release/22.x). +// LLVM 22 changed NestedNameSpecifier from pointer to value type, +// merged RecordType into TagType, and merged ElaboratedType into +// TypedefType/TagType via TypeWithKeyword. +// +// QDoc divergences from upstream are marked with "QDoc divergence" comments. +// ========================================================================= + +inline QualType getFullyQualifiedType(QualType QT, const ASTContext &Ctx, + bool WithGlobalNsPrefix); + +static inline NestedNameSpecifier +createNestedNameSpecifier(const ASTContext &Ctx, const NamespaceDecl *Namesp, + bool WithGlobalNsPrefix); + +static inline NestedNameSpecifier +createNestedNameSpecifier(const ASTContext &Ctx, const TypeDecl *TD, + bool FullyQualify, bool WithGlobalNsPrefix); + +static inline NestedNameSpecifier +createNestedNameSpecifierForScopeOf(const ASTContext &Ctx, const Decl *decl, + bool FullyQualified, + bool WithGlobalNsPrefix); + +static inline NestedNameSpecifier +getFullyQualifiedNestedNameSpecifier(const ASTContext &Ctx, + NestedNameSpecifier NNS, + bool WithGlobalNsPrefix); + +static inline bool getFullyQualifiedTemplateName(const ASTContext &Ctx, + TemplateName &TName, + bool WithGlobalNsPrefix) { + bool Changed = false; + NestedNameSpecifier NNS = std::nullopt; + + TemplateDecl *ArgTDecl = TName.getAsTemplateDecl(); + if (!ArgTDecl) // ArgTDecl can be null in dependent contexts. + return false; + + QualifiedTemplateName *QTName = TName.getAsQualifiedTemplateName(); + + if (QTName && + !QTName->hasTemplateKeyword() && + (NNS = QTName->getQualifier())) { + NestedNameSpecifier QNNS = + getFullyQualifiedNestedNameSpecifier(Ctx, NNS, WithGlobalNsPrefix); + if (QNNS != NNS) { + Changed = true; + NNS = QNNS; + } else { + NNS = std::nullopt; + } + } else { + NNS = createNestedNameSpecifierForScopeOf( + Ctx, ArgTDecl, true, WithGlobalNsPrefix); + } + if (NNS) { + TemplateName UnderlyingTN(ArgTDecl); + if (UsingShadowDecl *USD = TName.getAsUsingShadowDecl()) + UnderlyingTN = TemplateName(USD); + TName = + Ctx.getQualifiedTemplateName(NNS, + /*TemplateKeyword=*/false, UnderlyingTN); + Changed = true; + } + return Changed; +} + +static inline bool getFullyQualifiedTemplateArgument(const ASTContext &Ctx, + TemplateArgument &Arg, + bool WithGlobalNsPrefix) { + bool Changed = false; + + // Note: we do not handle TemplateArgument::Expression, to replace it + // we need the information for the template instance decl. + + if (Arg.getKind() == TemplateArgument::Template) { + TemplateName TName = Arg.getAsTemplate(); + Changed = getFullyQualifiedTemplateName(Ctx, TName, WithGlobalNsPrefix); + if (Changed) { + Arg = TemplateArgument(TName); + } + } else if (Arg.getKind() == TemplateArgument::Type) { + QualType SubTy = Arg.getAsType(); + // Check if the type needs more desugaring and recurse. + QualType QTFQ = getFullyQualifiedType(SubTy, Ctx, WithGlobalNsPrefix); + if (QTFQ != SubTy) { + Arg = TemplateArgument(QTFQ); + Changed = true; + } + } + return Changed; +} + +static inline const Type *getFullyQualifiedTemplateType( + const ASTContext &Ctx, + const TagType *TSTRecord, + ElaboratedTypeKeyword Keyword, + NestedNameSpecifier Qualifier, + bool WithGlobalNsPrefix) { + // We are asked to fully qualify and we have a Record Type, + // which can point to a template instantiation with no sugar in any of + // its template argument, however we still need to fully qualify them. + + const auto *TD = TSTRecord->getDecl(); + const auto *TSTDecl = dyn_cast(TD); + if (!TSTDecl) + return Ctx.getTagType(Keyword, Qualifier, TD, /*OwnsTag=*/false) + .getTypePtr(); + + const TemplateArgumentList &TemplateArgs = TSTDecl->getTemplateArgs(); + + bool MightHaveChanged = false; + SmallVector FQArgs; + for (unsigned int I = 0, E = TemplateArgs.size(); I != E; ++I) { + // cheap to copy and potentially modified by + // getFullyQualifedTemplateArgument + TemplateArgument Arg(TemplateArgs[I]); + MightHaveChanged |= + getFullyQualifiedTemplateArgument(Ctx, Arg, WithGlobalNsPrefix); + FQArgs.push_back(Arg); + } + + if (!MightHaveChanged) + return Ctx.getTagType(Keyword, Qualifier, TD, /*OwnsTag=*/false) + .getTypePtr(); + // If a fully qualified arg is different from the unqualified arg, + // allocate new type in the AST. + TemplateName TN = Ctx.getQualifiedTemplateName( + Qualifier, /*TemplateKeyword=*/false, + TemplateName(TSTDecl->getSpecializedTemplate())); + QualType QT = Ctx.getTemplateSpecializationType( + Keyword, TN, FQArgs, + /*CanonicalArgs=*/{}, TSTRecord->getCanonicalTypeInternal()); + // getTemplateSpecializationType returns a fully qualified + // version of the specialization itself, so no need to qualify + // it. + return QT.getTypePtr(); +} + +static inline const Type * +getFullyQualifiedTemplateType(const ASTContext &Ctx, + const TemplateSpecializationType *TST, + bool WithGlobalNsPrefix) { + TemplateName TName = TST->getTemplateName(); + bool MightHaveChanged = + getFullyQualifiedTemplateName(Ctx, TName, WithGlobalNsPrefix); + SmallVector FQArgs; + // Cheap to copy and potentially modified by + // getFullyQualifedTemplateArgument. + for (TemplateArgument Arg : TST->template_arguments()) { + MightHaveChanged |= + getFullyQualifiedTemplateArgument(Ctx, Arg, WithGlobalNsPrefix); + FQArgs.push_back(Arg); + } + + if (!MightHaveChanged) + return TST; + + QualType NewQT = + Ctx.getTemplateSpecializationType(TST->getKeyword(), TName, FQArgs, + /*CanonicalArgs=*/{}, TST->desugar()); + // getTemplateSpecializationType returns a fully qualified + // version of the specialization itself, so no need to qualify + // it. + return NewQT.getTypePtr(); +} + +static inline NestedNameSpecifier createOuterNNS(const ASTContext &Ctx, + const Decl *D, + bool FullyQualify, + bool WithGlobalNsPrefix) { + const DeclContext *DC = D->getDeclContext(); + if (const auto *NS = dyn_cast(DC)) { + while (NS && NS->isInline()) { + // Ignore inline namespace; + NS = dyn_cast(NS->getDeclContext()); + } + if (NS && NS->getDeclName()) { + return createNestedNameSpecifier(Ctx, NS, WithGlobalNsPrefix); + } + return std::nullopt; // no starting '::', no anonymous + } + if (const auto *TD = dyn_cast(DC)) + return createNestedNameSpecifier(Ctx, TD, FullyQualify, WithGlobalNsPrefix); + if (const auto *TDD = dyn_cast(DC)) + return createNestedNameSpecifier(Ctx, TDD, FullyQualify, + WithGlobalNsPrefix); + if (WithGlobalNsPrefix && DC->isTranslationUnit()) + return NestedNameSpecifier::getGlobal(); + return std::nullopt; // no starting '::' if |WithGlobalNsPrefix| is false +} + +/// Return a fully qualified version of this name specifier. +static inline NestedNameSpecifier getFullyQualifiedNestedNameSpecifier( + const ASTContext &Ctx, NestedNameSpecifier Scope, + bool WithGlobalNsPrefix) { + switch (Scope.getKind()) { + case NestedNameSpecifier::Kind::Null: + llvm_unreachable("can't fully qualify the empty nested name specifier"); + case NestedNameSpecifier::Kind::Global: + case NestedNameSpecifier::Kind::MicrosoftSuper: + // Already fully qualified + return Scope; + case NestedNameSpecifier::Kind::Namespace: + return TypeName::createNestedNameSpecifier( + Ctx, Scope.getAsNamespaceAndPrefix().Namespace->getNamespace(), + WithGlobalNsPrefix); + case NestedNameSpecifier::Kind::Type: { + const Type *Type = Scope.getAsType(); + // Find decl context. + const TypeDecl *TD; + if (const TagType *TagDeclType = Type->getAs()) + TD = TagDeclType->getDecl(); + else if (const auto *D = dyn_cast(Type)) + TD = D->getDecl(); + else + return Scope; + return TypeName::createNestedNameSpecifier(Ctx, TD, /*FullyQualify=*/true, + WithGlobalNsPrefix); + } + } + llvm_unreachable("bad NNS kind"); +} + +/// Create a nested name specifier for the declaring context of +/// the type. +static inline NestedNameSpecifier +createNestedNameSpecifierForScopeOf(const ASTContext &Ctx, const Decl *Decl, + bool FullyQualified, + bool WithGlobalNsPrefix) { + assert(Decl); + + // Some declaration cannot be qualified. + if (Decl->isTemplateParameter()) + return std::nullopt; + const DeclContext *DC = Decl->getDeclContext()->getRedeclContext(); + const auto *Outer = dyn_cast(DC); + const auto *OuterNS = dyn_cast(DC); + if (OuterNS && OuterNS->isAnonymousNamespace()) + OuterNS = dyn_cast(OuterNS->getParent()); + if (Outer) { +#if 0 + // QDoc divergence: upstream picks an arbitrary template specialization + // as the declaring context when a type is declared inside a class + // template but is not type-dependent. This produces unstable output + // (depends on specialization order) and is incorrect for QDoc's use + // case where we want the unspecialized template name. + // See QTBUG-144620. + if (const auto *CxxDecl = dyn_cast(DC)) { + if (ClassTemplateDecl *ClassTempl = + CxxDecl->getDescribedClassTemplate()) { + if (!ClassTempl->specializations().empty()) { + Decl = *(ClassTempl->spec_begin()); + Outer = dyn_cast(Decl); + OuterNS = dyn_cast(Decl); + } + } + } +#endif + + if (OuterNS) { + return createNestedNameSpecifier(Ctx, OuterNS, WithGlobalNsPrefix); + } else if (const auto *TD = dyn_cast(Outer)) { + return createNestedNameSpecifier( + Ctx, TD, FullyQualified, WithGlobalNsPrefix); + } else if (isa(Outer)) { + // Context is the TU. Nothing needs to be done. + return std::nullopt; + } else { + // Decl's context was neither the TU, a namespace, nor a + // TagDecl, which means it is a type local to a scope, and not + // accessible at the end of the TU. + return std::nullopt; + } + } else if (WithGlobalNsPrefix && DC->isTranslationUnit()) { + return NestedNameSpecifier::getGlobal(); + } + return std::nullopt; +} + +/// Create a nested name specifier for the declaring context of +/// the type. +static inline NestedNameSpecifier +createNestedNameSpecifierForScopeOf(const ASTContext &Ctx, const Type *TypePtr, + bool FullyQualified, + bool WithGlobalNsPrefix) { + if (!TypePtr) + return std::nullopt; + + Decl *Decl = nullptr; + // There are probably other cases ... + if (const auto *TDT = dyn_cast(TypePtr)) { + Decl = TDT->getDecl(); + } else if (const auto *TagDeclType = dyn_cast(TypePtr)) { + Decl = TagDeclType->getDecl(); + } else if (const auto *TST = dyn_cast(TypePtr)) { + Decl = TST->getTemplateName().getAsTemplateDecl(); + } else { + Decl = TypePtr->getAsCXXRecordDecl(); + } + + if (!Decl) + return std::nullopt; + + return createNestedNameSpecifierForScopeOf( + Ctx, Decl, FullyQualified, WithGlobalNsPrefix); +} + +inline NestedNameSpecifier +createNestedNameSpecifier(const ASTContext &Ctx, const NamespaceDecl *Namespace, + bool WithGlobalNsPrefix) { + while (Namespace && Namespace->isInline()) { + // Ignore inline namespace; + Namespace = dyn_cast(Namespace->getDeclContext()); + } + if (!Namespace) + return std::nullopt; + + bool FullyQualify = true; // doesn't matter, DeclContexts are namespaces + return NestedNameSpecifier( + Ctx, Namespace, + createOuterNNS(Ctx, Namespace, FullyQualify, WithGlobalNsPrefix)); +} + +inline NestedNameSpecifier +createNestedNameSpecifier(const ASTContext &Ctx, const TypeDecl *TD, + bool FullyQualify, bool WithGlobalNsPrefix) { + const Type *TypePtr = Ctx.getTypeDeclType(TD).getTypePtr(); + if (auto *RD = dyn_cast(TypePtr)) { + // We are asked to fully qualify and we have a Record Type (which + // may point to a template specialization) or Template + // Specialization Type. We need to fully qualify their arguments. + TypePtr = getFullyQualifiedTemplateType( + Ctx, RD, ElaboratedTypeKeyword::None, + createOuterNNS(Ctx, TD, FullyQualify, WithGlobalNsPrefix), + WithGlobalNsPrefix); + } else if (auto *TST = dyn_cast(TypePtr)) { + TypePtr = getFullyQualifiedTemplateType(Ctx, TST, WithGlobalNsPrefix); + } + return NestedNameSpecifier(TypePtr); +} + +/// Return the fully qualified type, including fully-qualified +/// versions of any template parameters. +inline QualType getFullyQualifiedType(QualType QT, const ASTContext &Ctx, + bool WithGlobalNsPrefix = false) { + // In case of myType* we need to strip the pointer first, fully + // qualify and attach the pointer once again. + if (isa(QT.getTypePtr())) { + // Get the qualifiers. + Qualifiers Quals = QT.getQualifiers(); + QT = getFullyQualifiedType(QT->getPointeeType(), Ctx, WithGlobalNsPrefix); + QT = Ctx.getPointerType(QT); + // Add back the qualifiers. + QT = Ctx.getQualifiedType(QT, Quals); + return QT; + } + + if (auto *MPT = dyn_cast(QT.getTypePtr())) { + // Get the qualifiers. + Qualifiers Quals = QT.getQualifiers(); + // Fully qualify the pointee and class types. + QT = getFullyQualifiedType(QT->getPointeeType(), Ctx, WithGlobalNsPrefix); + NestedNameSpecifier Qualifier = getFullyQualifiedNestedNameSpecifier( + Ctx, MPT->getQualifier(), WithGlobalNsPrefix); + QT = Ctx.getMemberPointerType(QT, Qualifier, + MPT->getMostRecentCXXRecordDecl()); + // Add back the qualifiers. + QT = Ctx.getQualifiedType(QT, Quals); + return QT; + } + + // In case of myType& we need to strip the reference first, fully + // qualify and attach the reference once again. + if (isa(QT.getTypePtr())) { + // Get the qualifiers. + bool IsLValueRefTy = isa(QT.getTypePtr()); + Qualifiers Quals = QT.getQualifiers(); + QT = getFullyQualifiedType(QT->getPointeeType(), Ctx, WithGlobalNsPrefix); + // Add the r- or l-value reference type back to the fully + // qualified one. + if (IsLValueRefTy) + QT = Ctx.getLValueReferenceType(QT); + else + QT = Ctx.getRValueReferenceType(QT); + // Add back the qualifiers. + QT = Ctx.getQualifiedType(QT, Quals); + return QT; + } + + // Handle types with attributes such as `unique_ptr _Nonnull`. + if (auto *AT = dyn_cast(QT.getTypePtr())) { + QualType NewModified = + getFullyQualifiedType(AT->getModifiedType(), Ctx, WithGlobalNsPrefix); + QualType NewEquivalent = + getFullyQualifiedType(AT->getEquivalentType(), Ctx, WithGlobalNsPrefix); + Qualifiers Qualifiers = QT.getLocalQualifiers(); + return Ctx.getQualifiedType( + Ctx.getAttributedType(AT->getAttrKind(), NewModified, NewEquivalent), + Qualifiers); + } + + // Remove the part of the type related to the type being a template + // parameter (we won't report it as part of the 'type name' and it + // is actually make the code below to be more complex (to handle + // those) + while (isa(QT.getTypePtr())) { + // Get the qualifiers. + Qualifiers Quals = QT.getQualifiers(); + + QT = cast(QT.getTypePtr())->desugar(); + + // Add back the qualifiers. + QT = Ctx.getQualifiedType(QT, Quals); + } + + if (const auto *TST = + dyn_cast(QT.getTypePtr())) { + + const Type *T = getFullyQualifiedTemplateType(Ctx, TST, WithGlobalNsPrefix); + if (T == TST) + return QT; + return Ctx.getQualifiedType(T, QT.getQualifiers()); + } + + // Local qualifiers are attached to the QualType outside of the + // elaborated type. Retrieve them before descending into the + // elaborated type. + Qualifiers PrefixQualifiers = QT.getLocalQualifiers(); + QT = QualType(QT.getTypePtr(), 0); + + // We don't consider the alias introduced by `using a::X` as a new type. + // The qualified name is still a::X. + if (const auto *UT = QT->getAs()) { + QT = Ctx.getQualifiedType(UT->desugar(), PrefixQualifiers); + return getFullyQualifiedType(QT, Ctx, WithGlobalNsPrefix); + } + + // Create a nested name specifier if needed. + NestedNameSpecifier Prefix = createNestedNameSpecifierForScopeOf( + Ctx, QT.getTypePtr(), true /*FullyQualified*/, WithGlobalNsPrefix); + + // In case of template specializations iterate over the arguments and + // fully qualify them as well. + if (const auto *TT = dyn_cast(QT.getTypePtr())) { + // We are asked to fully qualify and we have a Record Type (which + // may point to a template specialization) or Template + // Specialization Type. We need to fully qualify their arguments. + + const Type *TypePtr = getFullyQualifiedTemplateType( + Ctx, TT, TT->getKeyword(), Prefix, WithGlobalNsPrefix); + QT = QualType(TypePtr, 0); + } else if (const auto *TT = dyn_cast(QT.getTypePtr())) { + // QDoc divergence: prefer the existing qualifier from the TypedefType + // when available, falling back to the computed Prefix. This preserves + // member type alias qualifiers (e.g., QList::parameter_type) + // that would otherwise be lost when the Prefix is recomputed from the + // declaring context. See QTBUG-144620. + NestedNameSpecifier TypedefPrefix = TT->getQualifier(); + QT = Ctx.getTypedefType( + TT->getKeyword(), TypedefPrefix ? TypedefPrefix : Prefix, + TT->getDecl(), + getFullyQualifiedType(TT->desugar(), Ctx, WithGlobalNsPrefix)); + } else { + // QDoc divergence: upstream asserts here (!Prefix && "Unhandled type node"). + // QDoc encounters types (such as AutoType and BuiltinType) that may have + // a non-null Prefix but are not TagType or TypedefType. Silently dropping + // the prefix is safe — it only affects qualification of the printed name. + } + QT = Ctx.getQualifiedType(QT, PrefixQualifiers); + return QT; +} + +#else // CLANG_VERSION_MAJOR < 22 + +// ========================================================================= +// Pre-LLVM 22 implementation +// +// This block is the existing fork, unchanged. It supports LLVM 17–21 +// with version-specific guards for API differences between those releases. +// ========================================================================= + inline QualType getFullyQualifiedType(QualType QT, const ASTContext &Ctx, bool WithGlobalNsPrefix); @@ -503,6 +991,8 @@ return QT; } +#endif // CLANG_VERSION_MAJOR >= 22 + inline std::string getFullyQualifiedName(QualType QT, const ASTContext &Ctx, const PrintingPolicy &Policy, diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp 2026-04-02 17:22:21.000000000 -0500 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp 2026-04-04 15:45:32.000000000 -0500 @@ -42,7 +42,10 @@ #include "clang/AST/QualTypeNames.h" #include "template_declaration.h" +#include #include +#include +#include QT_BEGIN_NAMESPACE @@ -166,12 +169,86 @@ * representation of a type is acquired as part of parsing with Clang, * so as to ensure a consistent behavior and output. */ +/* + * Ensures that bare "(unnamed)" or "(anonymous)" markers in \a typeName + * include the record keyword (struct, union, class). With + * AnonymousTagLocations disabled, some LLVM versions omit the keyword + * for some or all anonymous scopes. This function recovers the correct + * keyword for each scope from the RecordDecl hierarchy. + * + * Only anonymous record types produce scope components in fully qualified + * names — anonymous enums don't create "(unnamed enum)::" segments + * because their enumerators are injected into the enclosing scope. + * + * For nested anonymous records such as "(unnamed)::(unnamed)" where the + * outer scope is a union and the inner is a struct, each marker receives + * its own keyword. The parent walk follows only RecordDecl contexts, + * which is sufficient because only anonymous records produce these + * scope components in Clang's fully qualified name output. + * + * The function assumes Clang produces structurally well-formed anonymous + * markers: either bare "(unnamed)" or with a keyword "(unnamed struct)". + * Malformed spellings would silently consume a keyword entry. + */ +static std::string ensureAnonymousTagKeyword(std::string typeName, clang::QualType type) +{ + const clang::RecordType *rt = type->getAs(); + if (!rt) + return typeName; + + // Collect keywords from innermost to outermost anonymous scope. + std::vector keywords; + const clang::RecordDecl *decl = rt->getDecl(); + while (decl) { + if (decl->getDeclName().isEmpty()) + keywords.emplace_back(decl->getKindName()); + const auto *parent = llvm::dyn_cast(decl->getDeclContext()); + decl = parent; + } + // Reverse so index 0 is the outermost anonymous scope, + // matching left-to-right marker order in the type string. + std::reverse(keywords.begin(), keywords.end()); + + // Scan left-to-right for "(unnamed" / "(anonymous" prefixes. + // Each prefix corresponds to one anonymous scope in the keyword list. + // Some LLVM versions already include the keyword (e.g., "(unnamed union)") + // while others produce bare "(unnamed)". Only inject when missing. + static constexpr std::string_view prefixes[] = { "(unnamed", "(anonymous" }; + size_t keywordIndex = 0; + size_t pos = 0; + while (pos < typeName.size() && keywordIndex < keywords.size()) { + std::string_view foundPrefix; + size_t foundPos = std::string::npos; + for (auto prefix : prefixes) { + size_t p = typeName.find(prefix, pos); + if (p < foundPos) { + foundPos = p; + foundPrefix = prefix; + } + } + if (foundPos == std::string::npos) + break; + + size_t afterPrefix = foundPos + foundPrefix.size(); + if (afterPrefix < typeName.size() && typeName[afterPrefix] == ')') { + // Bare marker — inject the keyword before ')'. + typeName.insert(afterPrefix, " " + keywords[keywordIndex]); + pos = afterPrefix + 1 + keywords[keywordIndex].size() + 1; + } else { + // Already has a keyword — skip past the closing ')'. + size_t closePos = typeName.find(')', afterPrefix); + pos = (closePos != std::string::npos) ? closePos + 1 : afterPrefix; + } + ++keywordIndex; + } + return typeName; +} + static std::string get_fully_qualified_type_name(clang::QualType type, const clang::ASTContext& declaration_context) { - return clang::TypeName::getFullyQualifiedName( - type, - declaration_context, - declaration_context.getPrintingPolicy() - ); + auto policy = declaration_context.getPrintingPolicy(); + policy.AnonymousTagLocations = false; + std::string result = clang::TypeName::getFullyQualifiedName(type, declaration_context, policy); + return ensureAnonymousTagKeyword(std::move(result), type); } /* @@ -681,39 +758,50 @@ auto function_declaration = get_cursor_declaration(cur)->getAsFunction(); - bool different = false; + bool typesDiffer = false; for (int i = 0; i < numArg; ++i) { - CXType argType = clang_getArgType(funcType, i); + auto *paramDecl = function_declaration->getParamDecl(i); + auto paramType = paramDecl->getOriginalType(); if (args.size() <= i) args.append(QString::fromStdString(get_fully_qualified_type_name( - function_declaration->getParamDecl(i)->getOriginalType(), - function_declaration->getASTContext() + paramType, function_declaration->getASTContext() ))); QString recordedType = parameters.at(i).type(); QString typeSpelling = args.at(i); - different = recordedType != typeSpelling; + typesDiffer = recordedType != typeSpelling; - // Retry with a canonical type spelling - if (different && (argType.kind == CXType_Typedef || argType.kind == CXType_Elaborated)) { - QStringView canonicalType = parameters.at(i).canonicalType(); - if (!canonicalType.isEmpty()) { - different = canonicalType != - QString::fromStdString(get_fully_qualified_type_name( - function_declaration->getParamDecl(i)->getOriginalType().getCanonicalType(), - function_declaration->getASTContext() - )); + // Retry with a canonical type spelling unless the parameter is a bare + // template type parameter, such as T but not const T& or MyContainer. + // Wrapped forms are safe because both sides of the comparison are + // canonicalized in the same way. Exclude bare TemplateTypeParmType + // because canonicalization removes the spelled Q_QDOC template + // parameter name and can make distinct Q_QDOC-declared signatures + // appear identical during matching. + if (typesDiffer) { + const bool isBareTemplateTypeParm = + paramType.getTypePtrOrNull() + && llvm::isa(paramType.getTypePtr()); + if (!isBareTemplateTypeParm) { + QStringView canonicalType = parameters.at(i).canonicalType(); + if (!canonicalType.isEmpty()) { + typesDiffer = canonicalType != + QString::fromStdString(get_fully_qualified_type_name( + paramType.getCanonicalType(), + function_declaration->getASTContext() + )); + } } } - if (different) { + if (typesDiffer) { break; } } - if (!different) + if (!typesDiffer) return fn; } return nullptr; @@ -1287,7 +1375,7 @@ fn->setMetaness(FunctionNode::Ctor); else if (kind == CXCursor_Destructor) fn->setMetaness(FunctionNode::Dtor); - else + else if (kind != CXCursor_ConversionFunction) fn->setReturnType(QString::fromStdString(get_fully_qualified_type_name( function_declaration->getReturnType(), function_declaration->getASTContext() diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/generator.cpp qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/generator.cpp --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/src/qdoc/generator.cpp 2026-04-02 17:22:21.000000000 -0500 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/src/qdoc/generator.cpp 2026-04-04 16:35:48.345773916 -0500 @@ -293,7 +293,7 @@ } else { base.clear(); const Node *p = node; - forever { + while (1) { const Node *pp = p->parent(); base.prepend(p->name()); if (pp == nullptr || pp->name().isEmpty() || pp->isTextPageNode()) diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/aliasuser.xml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/aliasuser.xml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/aliasuser.xml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/aliasuser.xml 2026-04-04 16:21:57.416310341 -0500 @@ -0,0 +1,34 @@ + + + +AliasUser Class +Qt +Tests that template container parameters appear with generic signatures + +A class that uses aliased template types as parameters. + + + + +Header + +template_sugar.h + + + + +Detailed Description +AliasUser exercises canonical fallback for type aliases around template types. The alias introduces an extra layer of type sugar that the original fallback gating would have handled, verifying that broadening the fallback doesn't regress alias resolution. + + +Member Function Documentation + +void AliasUser::process(ContainerAlias<int> items) +Processes the given items. + + +void AliasUser::transform(const ContainerAlias<double> &source, ContainerAlias<double> &dest) +Transforms elements from source into dest. + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/connector.xml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/connector.xml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/connector.xml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/connector.xml 2026-04-04 16:21:57.416402229 -0500 @@ -0,0 +1,34 @@ + + + +Connector Class +Qt +Tests that template container parameters appear with generic signatures + +A class for testing Q_QDOC-style template parameter overloads. + + + + +Header + +template_sugar.h + + + + +Detailed Description +Connector exercises the code path in findNodeForCursor where two overloads differ only in template parameter names, such as Functor vs PointerToMemberFunction. Without the TemplateTypeParmType guard, canonical comparison collapses both names to type-parameter-0-0, causing one overload to shadow the other. + + +Member Function Documentation + +template <typename Functor> void Connector::invoke(Functor callback) +Invokes callback asynchronously. + + +template <typename PointerToMemberFunction> void Connector::invoke(PointerToMemberFunction callback, int priority) +Invokes callback with the given priority. + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/dispatcher.xml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/dispatcher.xml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/dispatcher.xml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/dispatcher.xml 2026-04-04 16:21:57.416543044 -0500 @@ -0,0 +1,40 @@ + + + +Dispatcher Class +template <typename T> class Dispatcher +Qt +Tests that template container parameters appear with generic signatures + +A class for testing wrapped template parameter types. + + + + +Header + +template_sugar.h + + + + +Detailed Description +T is the dispatched element type. +Dispatcher exercises canonical fallback for wrapped template parameter types such as T *, const T &, and MyContainer<T>. These verify that canonical comparison is symmetric: both sides canonicalize the same way, so the fallback produces correct matches even though the user-facing template parameter name is lost in the canonical form. + + +Member Function Documentation + +void Dispatcher::byConstRef(const T &value) +Dispatches via a const reference to value. + + +void Dispatcher::byPointer(T *value) +Dispatches via a pointer to value. + + +void Dispatcher::nested(MyContainer<T> items) +Dispatches all elements in items. + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/mycontainer.xml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/mycontainer.xml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/mycontainer.xml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/mycontainer.xml 2026-04-04 16:21:57.416648466 -0500 @@ -0,0 +1,44 @@ + + + +MyContainer Class +template <typename T> class MyContainer +Qt +Tests that template container parameters appear with generic signatures + +A container class for testing template parameter type matching. + + + + +Header + +template_sugar.h + + + + +Detailed Description +T is the element type stored in the container. +MyContainer exercises the code path in findNodeForCursor where template parameter types must match between header parsing and \fn re-parsing. + + +Member Function Documentation + +void MyContainer::append(const T &value) +Appends value to the container. + + +void MyContainer::prepend(T value) +Prepends value to the container. + + +void MyContainer::replace(int index, const T &value) +Replaces the item at index with value. + + +MyContainer<T> MyContainer::operator+(const MyContainer<T> &other) const +Returns a container that is the concatenation of this container and other. + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/templatesugarmodule-module.xml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/templatesugarmodule-module.xml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/templatesugarmodule-module.xml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/docbook/templatesugarmodule-module.xml 2026-04-04 16:21:57.416722215 -0500 @@ -0,0 +1,44 @@ + + + + +Qt +Tests that template container parameters appear with generic signatures + +Module for template sugar tests. + + +Module for template sugar tests. + +Classes + + +AliasUser + +A class that uses aliased template types as parameters. + + + +Connector + +A class for testing Q_QDOC-style template parameter overloads. + + + +Dispatcher + +A class for testing wrapped template parameter types. + + + +MyContainer + +A container class for testing template parameter type matching. + + + + + +Detailed Description + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser-members.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser-members.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser-members.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser-members.html 2026-04-04 16:21:57.416842831 -0500 @@ -0,0 +1,21 @@ + + + + + + + List of All Members for AliasUser | Qt + + +
    +
  • AliasUser
    • +
+
+

List of All Members for AliasUser

+

This is the complete list of members for AliasUser, including inherited members.

+
    +
  • process(ContainerAlias<int>)
    • +
  • transform(const ContainerAlias<double> &, ContainerAlias<double> &)
    • +
+ + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/aliasuser.html 2026-04-04 16:21:57.416880830 -0500 @@ -0,0 +1,55 @@ + + + + + + + AliasUser Class | Qt + + +
    +
  • AliasUser
    • +
+
+
+

Contents

+ +
+
+

AliasUser Class

+ +

A class that uses aliased template types as parameters. More...

+ +
+ +
Header: #include <template_sugar.h>
+ +

Public Functions

+
+ + +
void process(ContainerAlias<int> items)
void transform(const ContainerAlias<double> &source, ContainerAlias<double> &dest)
+ +
+

Detailed Description

+

AliasUser exercises canonical fallback for type aliases around template types. The alias introduces an extra layer of type sugar that the original fallback gating would have handled, verifying that broadening the fallback doesn't regress alias resolution.

+
+ +
+

Member Function Documentation

+ +

void AliasUser::process(ContainerAlias<int> items)

+

Processes the given items.

+ + +

void AliasUser::transform(const ContainerAlias<double> &source, ContainerAlias<double> &dest)

+

Transforms elements from source into dest.

+ +
+ + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector-members.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector-members.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector-members.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector-members.html 2026-04-04 16:21:57.416961479 -0500 @@ -0,0 +1,21 @@ + + + + + + + List of All Members for Connector | Qt + + +
    +
  • Connector
    • +
+
+

List of All Members for Connector

+

This is the complete list of members for Connector, including inherited members.

+ + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/connector.html 2026-04-04 16:21:57.417078627 -0500 @@ -0,0 +1,55 @@ + + + + + + + Connector Class | Qt + + +
    +
  • Connector
    • +
+
+
+

Contents

+ +
+
+

Connector Class

+ +

A class for testing Q_QDOC-style template parameter overloads. More...

+ +
+ +
Header: #include <template_sugar.h>
+ +

Public Functions

+
+ + +
void invoke(Functor callback)
void invoke(PointerToMemberFunction callback, int priority)
+ +
+

Detailed Description

+

Connector exercises the code path in findNodeForCursor where two overloads differ only in template parameter names, such as Functor vs PointerToMemberFunction. Without the TemplateTypeParmType guard, canonical comparison collapses both names to type-parameter-0-0, causing one overload to shadow the other.

+
+ +
+

Member Function Documentation

+ +

template <typename Functor> void Connector::invoke(Functor callback)

+

Invokes callback asynchronously.

+ + +

template <typename PointerToMemberFunction> void Connector::invoke(PointerToMemberFunction callback, int priority)

+

Invokes callback with the given priority.

+ +
+ + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher-members.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher-members.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher-members.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher-members.html 2026-04-04 16:21:57.417205039 -0500 @@ -0,0 +1,22 @@ + + + + + + + List of All Members for Dispatcher | Qt + + +
    +
  • Dispatcher
    • +
+
+

List of All Members for Dispatcher

+

This is the complete list of members for Dispatcher, including inherited members.

+ + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/dispatcher.html 2026-04-04 16:21:57.417322303 -0500 @@ -0,0 +1,62 @@ + + + + + + + Dispatcher Class | Qt + + +
    +
  • Dispatcher
    • +
+
+
+

Contents

+ +
+
+

Dispatcher Class

+template <typename T> class Dispatcher + +

A class for testing wrapped template parameter types. More...

+ +
+ +
Header: #include <template_sugar.h>
+ +

Public Functions

+
+ + + +
void byConstRef(const T &value)
void byPointer(T *value)
void nested(MyContainer<T> items)
+ +
+

Detailed Description

+

T is the dispatched element type.

+

Dispatcher exercises canonical fallback for wrapped template parameter types such as T *, const T &, and MyContainer<T>. These verify that canonical comparison is symmetric: both sides canonicalize the same way, so the fallback produces correct matches even though the user-facing template parameter name is lost in the canonical form.

+
+ +
+

Member Function Documentation

+ +

void Dispatcher::byConstRef(const T &value)

+

Dispatches via a const reference to value.

+ + +

void Dispatcher::byPointer(T *value)

+

Dispatches via a pointer to value.

+ + +

void Dispatcher::nested(MyContainer<T> items)

+

Dispatches all elements in items.

+ +
+ + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer-members.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer-members.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer-members.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer-members.html 2026-04-04 16:21:57.417436996 -0500 @@ -0,0 +1,23 @@ + + + + + + + List of All Members for MyContainer | Qt + + +
    +
  • MyContainer
    • +
+
+

List of All Members for MyContainer

+

This is the complete list of members for MyContainer, including inherited members.

+ + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/mycontainer.html 2026-04-04 16:21:57.417551579 -0500 @@ -0,0 +1,67 @@ + + + + + + + MyContainer Class | Qt + + +
    +
  • MyContainer
    • +
+
+
+

Contents

+ +
+
+

MyContainer Class

+template <typename T> class MyContainer + +

A container class for testing template parameter type matching. More...

+ +
+ +
Header: #include <template_sugar.h>
+ +

Public Functions

+
+ + + + +
void append(const T &value)
void prepend(T value)
void replace(int index, const T &value)
MyContainer<T> operator+(const MyContainer<T> &other) const
+ +
+

Detailed Description

+

T is the element type stored in the container.

+

MyContainer exercises the code path in findNodeForCursor where template parameter types must match between header parsing and \fn re-parsing.

+
+ +
+

Member Function Documentation

+ +

void MyContainer::append(const T &value)

+

Appends value to the container.

+ + +

void MyContainer::prepend(T value)

+

Prepends value to the container.

+ + +

void MyContainer::replace(int index, const T &value)

+

Replaces the item at index with value.

+ + +

MyContainer<T> MyContainer::operator+(const MyContainer<T> &other) const

+

Returns a container that is the concatenation of this container and other.

+ +
+ + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/template-sugar-test.index qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/template-sugar-test.index --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/template-sugar-test.index 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/template-sugar-test.index 2026-04-04 16:21:57.417673308 -0500 @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/templatesugarmodule-module.html qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/templatesugarmodule-module.html --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/templatesugarmodule-module.html 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/html/templatesugarmodule-module.html 2026-04-04 16:21:57.417812296 -0500 @@ -0,0 +1,38 @@ + + + + + + + + + +
    +
+
+
+

Contents

+ +
+
+ +

Module for template sugar tests. More...

+ +

Classes

+
+ + + + +

AliasUser

A class that uses aliased template types as parameters

Connector

A class for testing Q_QDOC-style template parameter overloads

Dispatcher

A class for testing wrapped template parameter types

MyContainer

A container class for testing template parameter type matching

+ +
+

Detailed Description

+
+ + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/aliasuser.webxml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/aliasuser.webxml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/aliasuser.webxml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/aliasuser.webxml 2026-04-04 16:21:57.417933476 -0500 @@ -0,0 +1,25 @@ + + + + + + A class that uses aliased template types as parameters. + + AliasUser exercises canonical fallback for type aliases around template types. The alias introduces an extra layer of type sugar that the original fallback gating would have handled, verifying that broadening the fallback doesn't regress alias resolution. + + + + + Processes the given items. + + + + + + + Transforms elements from source into dest. + + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/connector.webxml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/connector.webxml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/connector.webxml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/connector.webxml 2026-04-04 16:21:57.418007325 -0500 @@ -0,0 +1,24 @@ + + + + + + A class for testing Q_QDOC-style template parameter overloads. + Connector exercises the code path in findNodeForCursor where two overloads differ only in template parameter names, such as Functor vs PointerToMemberFunction. Without the TemplateTypeParmType guard, canonical comparison collapses both names to type-parameter-0-0, causing one overload to shadow the other. + + + + + Invokes callback asynchronously. + + + + + + + Invokes callback with the given priority. + + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/dispatcher.webxml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/dispatcher.webxml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/dispatcher.webxml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/dispatcher.webxml 2026-04-04 16:21:57.418104383 -0500 @@ -0,0 +1,31 @@ + + + + + + A class for testing wrapped template parameter types. + + T is the dispatched element type. + Dispatcher exercises canonical fallback for wrapped template parameter types such as T *, const T &, and MyContainer<T>. These verify that canonical comparison is symmetric: both sides canonicalize the same way, so the fallback produces correct matches even though the user-facing template parameter name is lost in the canonical form. + + + + + Dispatches via a const reference to value. + + + + + + Dispatches via a pointer to value. + + + + + + Dispatches all elements in items. + + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/mycontainer.webxml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/mycontainer.webxml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/mycontainer.webxml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/mycontainer.webxml 2026-04-04 16:21:57.418157912 -0500 @@ -0,0 +1,39 @@ + + + + + + A container class for testing template parameter type matching. + + T is the element type stored in the container. + + MyContainer exercises the code path in findNodeForCursor where template parameter types must match between header parsing and \fn re-parsing. + + + + + Appends value to the container. + + + + + + Returns a container that is the concatenation of this container and other. + + + + + + Prepends value to the container. + + + + + + + Replaces the item at index with value. + + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/templatesugarmodule-module.webxml qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/templatesugarmodule-module.webxml --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/templatesugarmodule-module.webxml 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/expected/webxml/templatesugarmodule-module.webxml 2026-04-04 16:21:57.418214436 -0500 @@ -0,0 +1,4 @@ + + + + diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.cpp qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.cpp --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.cpp 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.cpp 2026-04-04 16:21:57.418302429 -0500 @@ -0,0 +1,127 @@ +// Copyright (C) 2026 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include "template_sugar.h" + +/*! + \module TemplateSugarModule + \brief Module for template sugar tests. +*/ + +/*! + \class MyContainer + \inmodule TemplateSugarModule + \brief A container class for testing template parameter type matching. + + \a T is the element type stored in the container. + + MyContainer exercises the code path in findNodeForCursor where + template parameter types must match between header parsing and + \\fn re-parsing. +*/ + +/*! + \fn template void MyContainer::append(const T &value) + + Appends \a value to the container. +*/ + +/*! + \fn template void MyContainer::prepend(T value) + + Prepends \a value to the container. +*/ + +/*! + \fn template MyContainer MyContainer::operator+(const MyContainer &other) const + + Returns a container that is the concatenation of this container + and \a other. +*/ + +/*! + \fn template void MyContainer::replace(int index, const T &value) + + Replaces the item at \a index with \a value. +*/ + +/*! + \class AliasUser + \inmodule TemplateSugarModule + \brief A class that uses aliased template types as parameters. + + AliasUser exercises canonical fallback for type aliases around + template types. The alias introduces an extra layer of type sugar + that the original fallback gating would have handled, verifying + that broadening the fallback doesn't regress alias resolution. +*/ + +/*! + \fn void AliasUser::process(ContainerAlias items) + + Processes the given \a items. +*/ + +/*! + \fn void AliasUser::transform(const ContainerAlias &source, ContainerAlias &dest) + + Transforms elements from \a source into \a dest. +*/ + +/*! + \class Connector + \inmodule TemplateSugarModule + \brief A class for testing Q_QDOC-style template parameter overloads. + + Connector exercises the code path in findNodeForCursor where + two overloads differ only in template parameter names, such as + \c Functor vs \c PointerToMemberFunction. Without the + TemplateTypeParmType guard, canonical comparison collapses both + names to \c type-parameter-0-0, causing one overload to shadow + the other. +*/ + +/*! + \fn template void Connector::invoke(Functor callback) + + Invokes \a callback asynchronously. +*/ + +/*! + \fn template void Connector::invoke(PointerToMemberFunction callback, int priority) + + Invokes \a callback with the given \a priority. +*/ + +/*! + \class Dispatcher + \inmodule TemplateSugarModule + \brief A class for testing wrapped template parameter types. + + \a T is the dispatched element type. + + Dispatcher exercises canonical fallback for wrapped template + parameter types such as \c {T *}, \c {const T &}, and + \c {MyContainer}. These verify that canonical comparison + is symmetric: both sides canonicalize the same way, so the + fallback produces correct matches even though the user-facing + template parameter name is lost in the canonical form. +*/ + +/*! + \fn template void Dispatcher::byPointer(T *value) + + Dispatches via a pointer to \a value. +*/ + +/*! + \fn template void Dispatcher::byConstRef(const T &value) + + Dispatches via a const reference to \a value. +*/ + +/*! + \fn template void Dispatcher::nested(MyContainer items) + + Dispatches all elements in \a items. +*/ diff -r -u --new-file qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.h qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.h --- qt-everywhere-src-6.10.3_20260330_6417867c.orig/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.h 1969-12-31 18:00:00.000000000 -0600 +++ qt-everywhere-src-6.10.3_20260330_6417867c/qttools/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/template_sugar/src/template_sugar.h 2026-04-04 16:21:57.418338791 -0500 @@ -0,0 +1,48 @@ +// Copyright (C) 2026 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#ifndef TEMPLATE_SUGAR_H +#define TEMPLATE_SUGAR_H + +template +class MyContainer { +public: + void append(const T &value); + void prepend(T value); + MyContainer operator+(const MyContainer &other) const; + void replace(int index, const T &value); +}; + +template +using ContainerAlias = MyContainer; + +class AliasUser { +public: + void process(ContainerAlias items); + void transform(const ContainerAlias &source, ContainerAlias &dest); +}; + +class Connector { +public: +#ifdef Q_QDOC + template + void invoke(Functor callback); + template + void invoke(PointerToMemberFunction callback, int priority); +#else + template + void invoke(F) {} + template + void invoke(F, int) {} +#endif +}; + +template +class Dispatcher { +public: + void byPointer(T *value); + void byConstRef(const T &value); + void nested(MyContainer items); +}; + +#endif // TEMPLATE_SUGAR_H