summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-24 06:37:55 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-24 06:37:55 (GMT)
commitdc904e1d9a110f8580cde4543a4c4b3813fa26e1 (patch)
tree0ceea85a521044407868cc8afc937bafd548bbb3 /tools/qdoc3/node.h
parent3e301a89f613a2304392236085e593ad765d741a (diff)
parent028655065de7f989a35b63bcab583767aba9c048 (diff)
downloadQt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.zip
Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.gz
Qt-dc904e1d9a110f8580cde4543a4c4b3813fa26e1.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts: src/corelib/io/qfsfileengine_unix.cpp
Diffstat (limited to 'tools/qdoc3/node.h')
-rw-r--r--tools/qdoc3/node.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 0cddf51..e956fed 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -157,6 +157,7 @@ class Node
QMap<LinkType, QPair<QString,QString> > links() const { return linkMap; }
QString moduleName() const;
QString url() const;
+ virtual QString nameForLists() const { return nam; }
Access access() const { return acc; }
const Location& location() const { return loc; }
@@ -337,6 +338,7 @@ class FakeNode : public InnerNode
QString fullTitle() const;
QString subTitle() const;
const NodeList &groupMembers() const { return gr; }
+ virtual QString nameForLists() const { return title(); }
private:
SubType sub;