diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index 31230550475..4d0e126651f 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -497,6 +497,9 @@ Tree::findUnambiguousTarget(const QString& target, Atom *&atom, const Node* rela int numBestTargets = 0; QList bestTargetList; + if (priv == 0) + return 0; + for (int pass = 0; pass < NumSuffixes; ++pass) { TargetHash::const_iterator i = priv->targetHash.constFind(Doc::canonicalTitle(target + suffixes[pass])); if (i != priv->targetHash.constEnd()) { @@ -523,7 +526,7 @@ Tree::findUnambiguousTarget(const QString& target, Atom *&atom, const Node* rela if (relative && !relative->qmlModuleIdentifier().isEmpty()) { for (int i=0; iqmlModuleIdentifier() == n->qmlModuleIdentifier()) { + if (n && relative->qmlModuleIdentifier() == n->qmlModuleIdentifier()) { atom = bestTargetList.at(i).atom; return n; }