summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-06-19 13:47:48 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-06-22 13:09:00 +0000
commitb1b91813664212cceef46192feec06fab265eadc (patch)
tree6ca501e1c08fb6928aff910df2b4ec024f4155bc
parentded46dc7a8d42c351f1a822c16b1eb507533b871 (diff)
downloadqttools-b1b91813664212cceef46192feec06fab265eadc.tar.gz
qdoc: Fix link generation code for \brief statements
There was a mistake in the previous commit (36914fc8) that caused incomplete <a href=""> tags to be generated for \brief statements. Change-Id: Ia93033c1d530468f94c3b5d45039b07f2af3e027 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--src/qdoc/htmlgenerator.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 43ea57403..2f7d5ba2c 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -2450,14 +2450,15 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
out() << "<p>";
generateText(brief, node, marker);
- if (!relative || node == relative)
- out() << " <a href=\"#";
- else
- out() << " <a href=\"" << linkForNode(node, relative) << '#';
-
- if (addLink)
- out() << registerRef("details") << "\">More...</a></p>\n";
+ if (addLink) {
+ if (!relative || node == relative)
+ out() << " <a href=\"#";
+ else
+ out() << " <a href=\"" << linkForNode(node, relative) << '#';
+ out() << registerRef("details") << "\">More...</a>";
+ }
+ out() << "</p>\n";
generateExtractionMark(node, EndMark);
}
}