diff options
author | Martin Smith <martin.smith@nokia.com> | 2012-03-30 13:43:46 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-02 12:30:04 +0200 |
commit | 9b0c0823c067eb0c072a6f35caec5cb31809a1b4 (patch) | |
tree | 406184aff17476566f1744e297ce93a493693725 /src/tools/qdoc/codemarker.cpp | |
parent | f733a0044ef9e31af0577d5b2695c659e29dc2e8 (diff) |
qdoc: Allow documenting a C++ class as a QML type.
Now qdoc can handle the case where a C++ class is
documented as a QML type of the same name, or as
both a C++ class and a QML type of the same name.
And collisions pages are created for both the HTML
and the DITA XML output. A collision page is created
when two items have the same name. The collision
pages will be augmented later to include the list
of pages where ambiguous links to one of the items
listed on the collision page are actually located,
so the writer can go back to those links and add
the appropriate qualifier.
Change-Id: I5a9632b2d2209e0784392047056bed8962005624
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/codemarker.cpp')
-rw-r--r-- | src/tools/qdoc/codemarker.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp index 9f22a287d2..fe0b366350 100644 --- a/src/tools/qdoc/codemarker.cpp +++ b/src/tools/qdoc/codemarker.cpp @@ -649,7 +649,6 @@ QStringList CodeMarker::macRefsForNode(Node *node) } case Node::Namespace: case Node::Fake: - case Node::Target: default: return QStringList(); } |