diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:31:50 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-18 11:31:50 (GMT) |
| commit | 68073bbcde2d1b12d36f0c58aab1fc20f02ab967 (patch) | |
| tree | a3b0bb1a56edf47e16f9c37b3142e41b2fc11600 /tools/qdoc3/tree.cpp | |
| parent | 9e7f0b9e45cef278c8874539257b4038a0aa6615 (diff) | |
| download | Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.zip Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.tar.gz Qt-68073bbcde2d1b12d36f0c58aab1fc20f02ab967.tar.bz2 | |
qdoc: Added a workaround for QML/Qt class name clashes.
Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3/tree.cpp')
| -rw-r--r-- | tools/qdoc3/tree.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp index 31bbf54..d31de4d 100644 --- a/tools/qdoc3/tree.cpp +++ b/tools/qdoc3/tree.cpp @@ -1952,9 +1952,13 @@ QString Tree::fullDocumentLocation(const Node *node) const else if (node->type() == Node::Fake) { #ifdef QDOC_QML if ((node->subType() == Node::QmlClass) || - (node->subType() == Node::QmlBasicType)) - return "qml-" + node->fileBase() + ".html"; - else + (node->subType() == Node::QmlBasicType)) { + QString fb = node->fileBase(); + if (fb.startsWith(QLatin1String("QML:"))) + return node->fileBase() + ".html"; + else + return "qml-" + node->fileBase() + ".html"; + } else #endif parentName = node->fileBase() + ".html"; } |