diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
| commit | 56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch) | |
| tree | 597051d1f3b73595f48bcad5a5acb24026c6ba66 /tools/qdoc3/node.h | |
| parent | e26db74521e063a1513731eb14581d93a3d77481 (diff) | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| download | Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'tools/qdoc3/node.h')
| -rw-r--r-- | tools/qdoc3/node.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index 021a052..3798e4e 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -383,11 +383,15 @@ class QmlClassNode : public FakeNode const ClassNode* classNode() const { return cnode; } virtual QString fileBase() const; + static void addInheritedBy(const QString& base, Node* sub); + static void subclasses(const QString& base, NodeList& subs); + public: static bool qmlOnly; + static QMultiMap<QString,Node*> inheritedBy; private: - const ClassNode* cnode; + const ClassNode* cnode; }; class QmlBasicTypeNode : public FakeNode |