diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
| commit | 540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf (patch) | |
| tree | 8ee7e6d700de3d911e8d0ccf4e2b2cd0a417fcde /tools/qdoc3/cppcodeparser.cpp | |
| parent | 84fd26983a40ecae3e761106aa8f550c3b7fd7ba (diff) | |
| parent | 7944ac1fb6eb0ae3bbbfdf6780b52f7174174a93 (diff) | |
| download | Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.zip Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.gz Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
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 d9e9c3b..021d64a 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); + QmlClassNode::addInheritedBy(arg,node->name()); } } else if (command == COMMAND_QMLDEFAULT) { |