diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-02-12 15:17:24 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-02-13 23:10:31 +0000 |
| commit | 37a316be78278f33cfae027b55a7a854a898db10 (patch) | |
| tree | 9b84fba7c3b93559e02dbb7b159fb78c5832a4f3 /src/qdoc/cppcodeparser.cpp | |
| parent | 064d81173cb52c2779686406ee7bd87fdda8301a (diff) | |
| download | qttools-37a316be78278f33cfae027b55a7a854a898db10.tar.gz | |
qdoc: Improve function overload handling
When QDoc calls Aggregate::normalizeOverloads(), process \internal
function nodes last. This ensures that they get assigned overload
numbers higher than the public ones, and adding internal overloads
no longer shuffle around the public HTML anchors (that are based on
the overload numbers).
Also, when searching for functions, ensure that we don't return an
\internal overload if a matching public one exists. This gets rid of
a number of linking warnings.
Change-Id: Idaac077e2f88d310e3261bf5b4c3df33ca02f873
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 91e3b78d8..cc077f440 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -591,7 +591,7 @@ void CppCodeParser::processMetaCommand(const Doc &doc, Note that this might set the overload flag of the primary function. This is ok because the overload flags and overload numbers will be resolved later - in resolveOverloadNumbers(). + in Aggregate::normalizeOverloads(). */ if (node->isFunction()) static_cast<FunctionNode*>(node)->setOverloadFlag(); |