diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
| commit | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch) | |
| tree | f493da0591281db183c23c86ecc3dc078009cafa /tools/qdoc3/ditaxmlgenerator.h | |
| parent | b92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff) | |
| parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
| download | Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2 | |
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
Diffstat (limited to 'tools/qdoc3/ditaxmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h index 71304b3..8c7e439 100644 --- a/tools/qdoc3/ditaxmlgenerator.h +++ b/tools/qdoc3/ditaxmlgenerator.h @@ -113,10 +113,11 @@ class DitaXmlGenerator : public PageGenerator QString fullQualification(const Node* n); void writeDerivations(const ClassNode* cn, CodeMarker* marker); - void writeLocation(const Node* n, CodeMarker* marker); + void writeLocation(const Node* n); void writeFunctions(const Section& s, const ClassNode* cn, CodeMarker* marker); + void writeParameters(const FunctionNode* fn, CodeMarker* marker); void writeNestedClasses(const Section& s, const ClassNode* cn, CodeMarker* marker); |