diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 14:00:47 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 14:00:47 (GMT) |
| commit | 36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce (patch) | |
| tree | f65778c976c7ac5f1fa6fb81e8e33982f1fd2e82 /tools/qdoc3/tree.cpp | |
| parent | 86c3fed122b8a6e47904d958f8c50fa19e668434 (diff) | |
| parent | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (diff) | |
| download | Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.zip Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.gz Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'tools/qdoc3/tree.cpp')
| -rw-r--r-- | tools/qdoc3/tree.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp index 56e3484..540ffa9 100644 --- a/tools/qdoc3/tree.cpp +++ b/tools/qdoc3/tree.cpp @@ -1963,8 +1963,8 @@ QString Tree::fullDocumentLocation(const Node *node) const if ((node->subType() == Node::QmlClass) || (node->subType() == Node::QmlBasicType)) { QString fb = node->fileBase(); - if (fb.startsWith(QLatin1String("QML:"))) - return node->fileBase() + ".html"; + if (fb.startsWith(QLatin1String("qml-"))) + return fb + ".html"; else return "qml-" + node->fileBase() + ".html"; } else @@ -1981,7 +1981,7 @@ QString Tree::fullDocumentLocation(const Node *node) const else if ((parentNode = node->parent())) { if (parentNode->subType() == Node::QmlPropertyGroup) { parentNode = parentNode->parent(); - parentName = "qml-" + parentNode->fileBase() + ".html"; + parentName = fullDocumentLocation(parentNode); } else parentName = fullDocumentLocation(node->parent()); |