diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-16 10:44:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-16 10:44:02 (GMT) |
| commit | 9e7f0b9e45cef278c8874539257b4038a0aa6615 (patch) | |
| tree | 6f66ec8ea599e348ea550da76612cb3873478a21 /tools/qdoc3/pagegenerator.cpp | |
| parent | 700a4826cf6bd755df000cb16c259343efb695cd (diff) | |
| parent | 5b5785bc564ccea9f6868d02be3d1080cb5039b9 (diff) | |
| download | Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.zip Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.tar.gz Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 13c83a8..cd364ef 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -299,8 +299,8 @@ QTextStream &PageGenerator::out() /*! Recursive writing of html files from the root \a node. */ -void PageGenerator::generateInnerNode(const InnerNode *node, - CodeMarker *marker) +void +PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) { if (!node->url().isNull()) return; |