diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 20:44:44 (GMT) |
| commit | ac67986f156861a7e64ed80a3a23db19fba8df6a (patch) | |
| tree | 26602e5314cbf73e91c78f885b1d5b583efad6ea /tools/qdoc3/cppcodeparser.cpp | |
| parent | 01116bb669f072af2227fff5f9da33bc77af7256 (diff) | |
| parent | 95e0e5b70b677a7468648a8ccc8d8ae553c3ca30 (diff) | |
| download | Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.zip Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.gz Qt-ac67986f156861a7e64ed80a3a23db19fba8df6a.tar.bz2 | |
Merge remote branch 'staging/master' into bearermanagement/staging
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index c8655a4..d9e9c3b 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1033,7 +1033,10 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, #ifdef QDOC_QML else if (command == COMMAND_QMLINHERITS) { setLink(node, Node::InheritsLink, arg); - } + if (node->subType() == Node::QmlClass) { + QmlClassNode::addInheritedBy(arg,node); + } + } else if (command == COMMAND_QMLDEFAULT) { QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node); qpgn->setDefault(); @@ -2299,14 +2302,6 @@ void CppCodeParser::createExampleFileNodes(FakeNode *fake) QString imagesPath = fullPath + "/images"; QStringList imageFiles = Config::getFilesHere(imagesPath,exampleImageFilter); -#if 0 - qDebug() << "examplePath:" << examplePath; - qDebug() << " exampleFiles" << exampleFiles; - qDebug() << "imagesPath:" << imagesPath; - qDebug() << "fullPath:" << fullPath; - qDebug() << " imageFiles" << imageFiles; -#endif - if (!exampleFiles.isEmpty()) { // move main.cpp and to the end, if it exists QString mainCpp; |