diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-05-22 13:59:13 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-06-10 12:46:53 +0000 |
| commit | 9b58fe5c264cabe6912bb4fb7b045c2aecd98cb7 (patch) | |
| tree | 81dc58aae68d25f9ecc966bf99ea2ce2569b9a94 /src/tools/qdoc/qdocindexfiles.cpp | |
| parent | 0ec550c748748fcc94008bc2555482bd614251dc (diff) | |
qdoc: Related non-members are now linked correctly
It was harder to fix this tan you might think, but the
fix cleans up the overload mechanism a lot, so if no
regressions are introduced by the fix, the code will
be easier to manage.
The related non-members are now added to the class
node's list of secondary (overload) functions. This
way, they get an overload number just like overloaded
member functions.
Change-Id: I68d7a314b0bb5ec0fbba15dc1fd40a5b870c659d
Task-number: QTBUG-46148
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index 2e49c1c5945..b80b1cc2497 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -520,8 +520,14 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, functionNode->setMetaness(meta); functionNode->setConst(element.attribute("const") == "true"); functionNode->setStatic(element.attribute("static") == "true"); - functionNode->setOverload(element.attribute("overload") == "true"); - + if (element.attribute("overload") == "true") { + functionNode->setOverloadFlag(true); + functionNode->setOverloadNumber(element.attribute("overload-number").toUInt()); + } + else { + functionNode->setOverloadFlag(false); + functionNode->setOverloadNumber(0); + } if (element.hasAttribute("relates") && element.attribute("relates") != parent->name()) { relatedList_.append( |