From a5570bbf9af05fa33cfcc9f167786e8d2ca1e32e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 30 Jul 2014 13:44:15 +0200 Subject: qdoc: Remove all collision node stuff from qdoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- src/tools/qdoc/cppcodemarker.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/tools/qdoc/cppcodemarker.cpp') 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>::"); node = node->parent(); -- cgit v1.2.3