diff options
Diffstat (limited to 'src/qdoc/qdocdatabase.cpp')
| -rw-r--r-- | src/qdoc/qdocdatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp index 1707963c8..e3331a4f0 100644 --- a/src/qdoc/qdocdatabase.cpp +++ b/src/qdoc/qdocdatabase.cpp @@ -1460,21 +1460,21 @@ void QDocDatabase::resolveQmlInheritance(Aggregate* root) QmlTypeNode* qcn = static_cast<QmlTypeNode*>(child); if (qcn->qmlBaseNodeNotSet() && !qcn->qmlBaseName().isEmpty()) { QmlTypeNode* bqcn = static_cast<QmlTypeNode*>(previousSearches.value(qcn->qmlBaseName())); - if (bqcn) + if (bqcn && (bqcn != qcn)) qcn->setQmlBaseNode(bqcn); else { if (!qcn->importList().isEmpty()) { const ImportList& imports = qcn->importList(); for (int i=0; i<imports.size(); ++i) { bqcn = findQmlType(imports[i], qcn->qmlBaseName()); - if (bqcn) + if (bqcn && (bqcn != qcn)) break; } } if (bqcn == 0) { bqcn = findQmlType(QString(), qcn->qmlBaseName()); } - if (bqcn) { + if (bqcn && (bqcn != qcn)) { qcn->setQmlBaseNode(bqcn); previousSearches.insert(qcn->qmlBaseName(), bqcn); } |