summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-09-09 11:28:28 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-09-09 11:28:28 (GMT)
commit4a72a9b07e805b4ba27560e8e921bcee0002ef4c (patch)
treefa14df8563a93fb4ba9a8c64199e6136b96e02d4
parent81da20ff839843634ee6db5f517bfcb7ef87d4b9 (diff)
downloadDoxygen-4a72a9b07e805b4ba27560e8e921bcee0002ef4c.zip
Doxygen-4a72a9b07e805b4ba27560e8e921bcee0002ef4c.tar.gz
Doxygen-4a72a9b07e805b4ba27560e8e921bcee0002ef4c.tar.bz2
issue #7248: Including external tag files with TOC produces a broken index.qhp
Ignore automatically generated anchor names when importing a tag file.
-rw-r--r--src/tagreader.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 56dbe7d..d79d9b5 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
void endDocAnchor()
{
+ // Check whether or not the tag is automatically generate, in that case ignore the tag.
+ switch(m_state)
+ {
+ case InClass:
+ case InFile:
+ case InNamespace:
+ case InGroup:
+ case InPage:
+ case InMember:
+ case InPackage:
+ case InDir:
+ if (QString(m_curString).startsWith("autotoc_md")) return;
+ break;
+ default:
+ warn("Unexpected tag 'docanchor' found");
+ return;
+ }
switch(m_state)
{
case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- default: warn("Unexpected tag 'docanchor' found"); break;
+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore
}
}