summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-06 08:22:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-06 08:22:22 (GMT)
commita2678bfea8ce59e18790170c33ab92e9aa3aa781 (patch)
treecf4da3b94661daadbcf5f7317464c9a159900637
parent4409d1b454f02fa1e5e07560a1db6012074172eb (diff)
parentc772ab261c3a09fab786306c70796c3c5f0efb15 (diff)
downloadQt-a2678bfea8ce59e18790170c33ab92e9aa3aa781.zip
Qt-a2678bfea8ce59e18790170c33ab92e9aa3aa781.tar.gz
Qt-a2678bfea8ce59e18790170c33ab92e9aa3aa781.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed QTBUG-18591
-rw-r--r--tools/qdoc3/htmlgenerator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 114db26..88bc3e2 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1494,8 +1494,10 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
QString allQmlMembersLink = generateAllQmlMembersFile(qml_cn, marker);
if (!allQmlMembersLink.isEmpty()) {
+ out() << "<ul>\n";
out() << "<li><a href=\"" << allQmlMembersLink << "\">"
<< "List of all members, including inherited members</a></li>\n";
+ out() << "</ul>\n";
}
s = sections.begin();