summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/codemarker.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-08-17 05:30:30 (GMT)
commitae1fde5d436a047c124f8382fdcd71bb1af306e3 (patch)
treea937de1c678aaeda2f12fac891f49930d244e954 /tools/qdoc3/codemarker.cpp
parent50a53d2f7a7e12cd597dc72a08ad62b79fee4554 (diff)
parent8afc6773067bb878020c29b3bebfe8662e3fbfdd (diff)
downloadQt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.zip
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.gz
Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tools/qdoc3/codemarker.cpp')
-rw-r--r--tools/qdoc3/codemarker.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index 7130d61..ec86ae3 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -624,7 +624,9 @@ QString CodeMarker::macName(const Node *node, const QString &name)
Get the list of documentation sections for the children of
the specified QmlClassNode.
*/
-QList<Section> CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle )
+QList<Section> CodeMarker::qmlSections(const QmlClassNode* ,
+ SynopsisStyle ,
+ const Tree* )
{
return QList<Section>();
}