summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/generator.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-02 09:32:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-02 09:32:21 (GMT)
commit6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a (patch)
tree8089fc5a8205b117a722c3567cd733dad90dbceb /tools/qdoc3/generator.h
parentf309c1cc1b0212f1c882fca5adb0e7d7ef552de9 (diff)
parentd0c4433ca1aabab1a8fac1aae2ba65f25dae5f85 (diff)
downloadQt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.zip
Qt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.tar.gz
Qt-6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc errors. qdoc: Second attempt, QML doc stuff.
Diffstat (limited to 'tools/qdoc3/generator.h')
-rw-r--r--tools/qdoc3/generator.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 44f56e2..30d9af4 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -169,6 +169,13 @@ class Generator
const QList<RelatedClass> &classes,
CodeMarker *marker);
+ protected:
+ void appendSortedQmlNames(Text& text,
+ const Node* base,
+ const NodeList& subs,
+ CodeMarker *marker);
+
+ private:
QString amp;
QString lt;
QString gt;