summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/generator.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-29 07:09:54 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-29 07:43:30 (GMT)
commit0eaa3466077839b0cef2ad6c326d80f398eccae7 (patch)
tree4c6855559ec940e2ac87514d14a0573593247915 /tools/qdoc3/generator.h
parenta45fe18569be1fc91e26f6e58d2f16bc8c6958de (diff)
downloadQt-0eaa3466077839b0cef2ad6c326d80f398eccae7.zip
Qt-0eaa3466077839b0cef2ad6c326d80f398eccae7.tar.gz
Qt-0eaa3466077839b0cef2ad6c326d80f398eccae7.tar.bz2
Merge QML specific qdoc changes
Reviewed-by: Martin Smith
Diffstat (limited to 'tools/qdoc3/generator.h')
-rw-r--r--tools/qdoc3/generator.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index cdc4c29..8e3c57e 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -99,7 +99,10 @@ class Generator
#ifdef QDOC_QML
virtual bool generateQmlText(const Text& text,
const Node *relative,
- CodeMarker *marker);
+ CodeMarker *marker,
+ const QString& qmlName);
+ virtual void generateQmlInherits(const QmlClassNode* cn,
+ CodeMarker* marker);
#endif
virtual void generateBody(const Node *node, CodeMarker *marker);
virtual void generateAlsoList(const Node *node, CodeMarker *marker);