diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
| commit | 5a039bf53e88a727cc52bfedb21796ebfade01a1 (patch) | |
| tree | abce106bf1cb1042dcacd249152a11343caa0313 /src/tools/qdoc/qdocdatabase.h | |
| parent | dbcf5730ac2d4f61f872e50126d3ce73e3f6031e (diff) | |
| parent | 89302b8b88b2bfa9581bb15c1caa052cb6d76988 (diff) | |
Merge dev into 5.6
Change-Id: I061f2513ef58f696e75b11928d89aaaf059659a3
Diffstat (limited to 'src/tools/qdoc/qdocdatabase.h')
| -rw-r--r-- | src/tools/qdoc/qdocdatabase.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h index 5d55ea48e13..80a92af4ede 100644 --- a/src/tools/qdoc/qdocdatabase.h +++ b/src/tools/qdoc/qdocdatabase.h @@ -141,15 +141,8 @@ class QDocForest const Node* findFunctionNode(const QString& target, const Node* relative, - Node::Genus genus) { - foreach (Tree* t, searchOrder()) { - const Node* n = t->findFunctionNode(target, relative, genus); - if (n) - return n; - relative = 0; - } - return 0; - } + Node::Genus genus); + const Node* findNodeForTarget(QStringList& targetPath, const Node* relative, Node::Genus genus, |