summaryrefslogtreecommitdiffstats
path: root/src/qdoc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2018-06-08 10:14:01 +0200
committerMartin Smith <martin.smith@qt.io>2018-06-08 08:20:09 +0000
commit9f9e575b3cc0e434102b6b22952dfc8e19ac5d1f (patch)
tree0a2b271c50fe786234e5ca2cd225e88f516be87a /src/qdoc
parent8d4df6d98d493e7421053d50ddb2a2e52f586f49 (diff)
qdoc: Don't output empty QML sections in QML basic types
This update avoids writing empty QML documentation sections to the HTML file for a QML basic type. Change-Id: Iedf4438128ce16000c036d9e94838d6b8e39bf2f Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc')
-rw-r--r--src/qdoc/htmlgenerator.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 58a86d760..c2552214e 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1615,11 +1615,13 @@ void HtmlGenerator::generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker*
SectionVector::const_iterator s = sections.stdQmlTypeSummarySections().constBegin();
while (s != sections.stdQmlTypeSummarySections().constEnd()) {
- QString ref = registerRef(s->title().toLower());
- out() << "<a name=\"" << ref
- << "\"></a>" << divNavTop << '\n';
- out() << "<h2 id=\"" << ref << "\">" << protectEnc(s->title()) << "</h2>\n";
- generateQmlSummary(*s, qbtn, marker);
+ if (!s->isEmpty()) {
+ QString ref = registerRef(s->title().toLower());
+ out() << "<a name=\"" << ref
+ << "\"></a>" << divNavTop << '\n';
+ out() << "<h2 id=\"" << ref << "\">" << protectEnc(s->title()) << "</h2>\n";
+ generateQmlSummary(*s, qbtn, marker);
+ }
++s;
}
@@ -1633,12 +1635,14 @@ void HtmlGenerator::generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker*
s = sections.stdQmlTypeDetailsSections().constBegin();
while (s != sections.stdQmlTypeDetailsSections().constEnd()) {
- out() << "<h2>" << protectEnc(s->title()) << "</h2>\n";
- NodeVector::ConstIterator m = s->members().constBegin();
- while (m != s->members().constEnd()) {
- generateDetailedQmlMember(*m, qbtn, marker);
- out() << "<br/>\n";
- ++m;
+ if (!s->isEmpty()) {
+ out() << "<h2>" << protectEnc(s->title()) << "</h2>\n";
+ NodeVector::ConstIterator m = s->members().constBegin();
+ while (m != s->members().constEnd()) {
+ generateDetailedQmlMember(*m, qbtn, marker);
+ out() << "<br/>\n";
+ ++m;
+ }
}
++s;
}