diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-16 05:13:43 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-16 05:13:43 (GMT) |
| commit | 07d6c4f8a92110a4fb386e184d4b0e866d897fbc (patch) | |
| tree | cbd0bd5a9c9181af467c9765b869ac8e47d77da5 /tools | |
| parent | ab11576ca4987c7da9fcffb9cab286c1b227b74d (diff) | |
| parent | 909c955ede61cff9eb520d8e90f346cca7716696 (diff) | |
| download | Qt-07d6c4f8a92110a4fb386e184d4b0e866d897fbc.zip Qt-07d6c4f8a92110a4fb386e184d4b0e866d897fbc.tar.gz Qt-07d6c4f8a92110a4fb386e184d4b0e866d897fbc.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/maemo-fixes
Diffstat (limited to 'tools')
| -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()); |