diff options
author | Martin Smith <martin.smith@digia.com> | 2015-03-24 11:57:58 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@digia.com> | 2015-03-27 13:55:56 +0000 |
commit | 696a18b063a890c4425121a6011d6fd5ba1c3f00 (patch) | |
tree | 65637a14a9dc2e0b8c60594aa69a715960880c60 /src/tools/qdoc/htmlgenerator.cpp | |
parent | 6a5e2f69a898b0fca3ec75caeddac4a69803269f (diff) |
qdoc: No internal qmlabstract types in the "inherited by" list
This update ensures that there are no internal QML types in a
QML type's "inherited by" list. It also fixes a bug that caused
the "inherited by" lists to be empty when running qdoc in the
single-exec mode.
Change-Id: Iee8b9dbcd56a09b7a49ec8a703b5d861f0b1f0ec
Task-number: QTBUG-44004
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 8bc910e6a6..0fc9a30836 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -2247,9 +2247,9 @@ void HtmlGenerator::generateQmlRequisites(QmlTypeNode *qcn, CodeMarker *marker) QString logicalModuleVersion; CollectionNode* collection = 0; if (qcn->isJsNode()) - qdb_->findJsModule(qcn->logicalModuleName()); + collection = qdb_->findJsModule(qcn->logicalModuleName()); else - qdb_->findQmlModule(qcn->logicalModuleName()); + collection = qdb_->findQmlModule(qcn->logicalModuleName()); if (collection) logicalModuleVersion = collection->logicalModuleVersion(); else |