diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/tools/qdoc/tree.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/tools/qdoc/tree.cpp')
| -rw-r--r-- | src/tools/qdoc/tree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index 5dd85405955..113220059c8 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -171,7 +171,7 @@ const Node* Tree::findNode(const QStringList& path, || ((FunctionNode*)node)->metaness() == FunctionNode::MacroWithoutParams)) { if ((node != self) && (node->type() != Node::QmlPropertyGroup)) { if (node->subType() == Node::Collision) { - node = node->applyModuleIdentifier(start); + node = node->applyModuleName(start); } return node; } |