summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-05-19 10:53:07 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-06-05 12:57:09 +0000
commitb0d85c45adb09a7b7f50420ca30b35a70711699b (patch)
treecea88317b32dd8993b562ea8ebe7121be840cd25
parentd32f47b70387713335656a8e93f289c819fb9b05 (diff)
qdoc: Clear the map of HTML anchors for each generated page
To avoid conflicting anchors within an HTML page, QDoc keeps the used anchors in a map, and appends 'x' to new anchors if it was already used. However, this map was never cleared, so anchors on one page affected the ones generated for another page. This commit clears the map for each page when generating the page header. Change-Id: Id30baced46917bb4d48cf58dde047f4fbcdf74cf Task-number: QTBUG-46153 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index b340883c12..2066342a6a 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1986,6 +1986,7 @@ void HtmlGenerator::generateHeader(const QString& title,
out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, qdb_->version());
navigationLinks.clear();
+ refMap.clear();
if (node && !node->links().empty()) {
QPair<QString,QString> linkPair;