diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
| commit | 2c6de1ce1489668253b7d3a5df3f2194fbd1bee7 (patch) | |
| tree | 3e4298cdb45f9b60ac9b7bb27b5ec3bdbd540b2f /tools/qdoc3/cppcodeparser.cpp | |
| parent | d042a00b5828961e1e1fa82017717b5f72dde9ef (diff) | |
| parent | 82991e40afd46f91de42dec048df705441b6b0cf (diff) | |
| download | Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.zip Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.gz Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.bz2 | |
Merge remote branch 'staging/4.7' into HEAD
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
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) { |