summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/pagegenerator.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-06-17 00:29:02 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-06-17 00:29:02 (GMT)
commit5ae513c05a1b844745cc80834dac43f16bf62092 (patch)
treeb93601dd5daf3b18091069791c7d10057ffd7a92 /tools/qdoc3/pagegenerator.cpp
parent7a577ff67388413a882435c5cbd1ad6d1fa8393d (diff)
parent7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (diff)
downloadQt-5ae513c05a1b844745cc80834dac43f16bf62092.zip
Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.gz
Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
-rw-r--r--tools/qdoc3/pagegenerator.cpp4
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;