diff options
| author | Martin Smith <martin.smith@digia.com> | 2014-07-30 13:44:15 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2014-08-22 18:23:39 +0200 |
| commit | a5570bbf9af05fa33cfcc9f167786e8d2ca1e32e (patch) | |
| tree | 40749767c38c88e6a52f66572664df5df61ab908 /src/tools/qdoc/cppcodemarker.cpp | |
| parent | 701b72c261922a2f96e3433f1f82646b1b339ff0 (diff) | |
qdoc: Remove all collision node stuff from qdoc
Now that the qdoc link command has ability to tell qdoc which module
contains a link target or whether to link to a QML or CPP entity,
collision pages should no longer be necessary. In fact, qdoc hasn't
been generating any collisions for some time. This task removes all
the collision node code from qdoc.
Task-number: QTBUG-40506
Change-Id: I34d1980ca1c0fe4bb5ad27dd4b00e61fa7e6e335
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/cppcodemarker.cpp')
| -rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index af2ff76405..715e7daa6e 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -410,8 +410,7 @@ QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, const Node *r QString fullName; while (node->parent()) { fullName.prepend(markedUpName(node)); - if (node->parent() == relative || node->parent()->name().isEmpty() || - node->parent()->isCollisionNode()) + if (node->parent() == relative || node->parent()->name().isEmpty()) break; fullName.prepend("<@op>::</@op>"); node = node->parent(); |