diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 17:15:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 17:15:41 +0200 |
| commit | 608e1856265c5e490f13cb22089bd1d9be4a9bfe (patch) | |
| tree | 248d33efbb2af32a856dbfc98a221eee9cd19c22 /src/qdoc/cppcodeparser.cpp | |
| parent | 89d766d65393a0445ddf5100b7db39f6ba1ed901 (diff) | |
| parent | 781efbabf32e4438ae9c698ce498cc32cc900c57 (diff) | |
| download | qttools-608e1856265c5e490f13cb22089bd1d9be4a9bfe.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I29e1f5d7d146cc77f8cf92bfbe2e41ffad50a041
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index f985226dd..c7d1e3507 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -972,7 +972,6 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (node->isQmlType() || node->isJsType()) { QmlTypeNode* qmlType = static_cast<QmlTypeNode*>(node); qmlType->setQmlBaseName(arg); - QmlTypeNode::addInheritedBy(arg,node); } } else if (command == COMMAND_QMLINSTANTIATES) { |