summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodemarker.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2019-09-18 14:37:13 +0200
committerTopi Reinio <topi.reinio@qt.io>2019-09-20 12:02:13 +0200
commit4d41739403202c6717f9c2a1a9321d2ef76caeee (patch)
treef80f64c7e6c03a2a1364e2082b0517524150785f /src/qdoc/cppcodemarker.cpp
parent5cfa917baf416f6234bd99e51f05514b1859e2fe (diff)
downloadqttools-4d41739403202c6717f9c2a1a9321d2ef76caeee.tar.gz
qdoc: Fix issues with related non-members
The \relates command sets a node as a related non-member of another node, and sets that node as the new parent. However, the old parent still holds a pointer to the newly-adopted node; this is needed for searching. Some locations in the code did not handle the possibility of parent's children reporting a different node as their parent. Skipping these nodes when traversing the node tree eliminates duplicate entries from .qhp files. These duplicates are however needed in the .index files for linking to work, as links may reference both the global namespace and the scope the node relates to. Remove these duplicates from .qhp files, and omit parent names when generating 'id' attributes for related non-members. This reverts the .qhp content to what it was in Qt 5.12. Parents of related members must be skipped when resolving the full name of the node, otherwise searching for the name is likely to fail. Non-members related to a header file did not receive a valid location ('href'). Task-number: QTBUG-78474 Change-Id: Ie126219e8101beaa051f2f4a1a9f93c731fc8168 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
0 files changed, 0 insertions, 0 deletions