summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-11-06 13:18:42 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-11-11 12:47:36 (GMT)
commit37de9752d214b581dea3896676663d6815a932c1 (patch)
tree4461189bb38086b28c3844e0a111bdf587a8f4f1 /tools
parent385ef0b086d0736d1dd8ef03ced73c73e61dcb43 (diff)
downloadQt-37de9752d214b581dea3896676663d6815a932c1.zip
Qt-37de9752d214b581dea3896676663d6815a932c1.tar.gz
Qt-37de9752d214b581dea3896676663d6815a932c1.tar.bz2
qdoc3: Output the full signature for QML signals and methods
In the Method Documentation and Signal Documentation sections.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/cppcodemarker.cpp2
-rw-r--r--tools/qdoc3/htmlgenerator.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index f3188bd..a8f6a02 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -194,6 +194,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node,
synopsis = "class " + name;
break;
case Node::Function:
+ case Node::QmlSignal:
+ case Node::QmlMethod:
func = (const FunctionNode *) node;
if (style != SeparateList && !func->returnType().isEmpty())
synopsis = typified(func->returnType()) + " ";
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index ae47fc0..f0ddade 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4224,7 +4224,8 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
out() << "<table class=\"qmlname\">";
out() << "<tr><td>";
out() << "<a name=\"" + refForNode(qsn) + "\"></a>";
- generateQmlItem(qsn,relative,marker,false);
+ generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
+ //generateQmlItem(qsn,relative,marker,false);
out() << "</td></tr>";
out() << "</table>";
out() << "</div>";
@@ -4235,7 +4236,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
out() << "<table class=\"qmlname\">";
out() << "<tr><td>";
out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
- generateQmlItem(qmn,relative,marker,false);
+ generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
out() << "</td></tr>";
out() << "</table>";
out() << "</div>";