diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 09:32:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 09:32:21 (GMT) |
| commit | 6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a (patch) | |
| tree | 8089fc5a8205b117a722c3567cd733dad90dbceb /tools/qdoc3/cppcodeparser.cpp | |
| parent | f309c1cc1b0212f1c882fca5adb0e7d7ef552de9 (diff) | |
| parent | d0c4433ca1aabab1a8fac1aae2ba65f25dae5f85 (diff) | |
| download | Qt-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/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 021d64a..d9e9c3b 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1034,7 +1034,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (command == COMMAND_QMLINHERITS) { setLink(node, Node::InheritsLink, arg); if (node->subType() == Node::QmlClass) { - QmlClassNode::addInheritedBy(arg,node->name()); + QmlClassNode::addInheritedBy(arg,node); } } else if (command == COMMAND_QMLDEFAULT) { |