diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-12-03 14:42:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-04 09:11:34 +0100 |
| commit | dd97932a04c1ef27d0e4d73b701acc2aad411b07 (patch) | |
| tree | 59ca02f8da172f5b4daab49825a95be2b489ccbd | |
| parent | ac54abfb07579c747612c0d9e53089fe5cd32caf (diff) | |
qdoc: Fix output filenames for QML basic type documentation
qdoc intends to prepend all html files related to QML with
a 'qml-' prefix. This doesn't work for basic QML types, as
those nodes do not have valid qml module name information.
This change fixes the issue by removing the requirement
for a qml module name, thereby always using the qml
prefix for a qml (basic) type.
Task-number: QTBUG-35229
Change-Id: If61572b2dc8a39be08140c37aa59646b88e99b29
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 97a980a3fa..3cbba788c8 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -334,14 +334,14 @@ QString Generator::fileBase(const Node *node) const if (node->isQmlNode()) { if (!node->qmlModuleName().isEmpty()) { base.prepend(node->qmlModuleName() + QLatin1Char('-')); - /* - To avoid file name conflicts in the html directory, - we prepend a prefix (by default, "qml-") to the file name of QML - element doc files. - */ - if ((node->subType() == Node::QmlClass) || (node->subType() == Node::QmlBasicType)) { - base.prepend(outputPrefix(QLatin1String("QML"))); - } + } + /* + To avoid file name conflicts in the html directory, + we prepend a prefix (by default, "qml-") to the file name of QML + element doc files. + */ + if ((node->subType() == Node::QmlClass) || (node->subType() == Node::QmlBasicType)) { + base.prepend(outputPrefix(QLatin1String("QML"))); } } else if (node->subType() == Node::QmlModule) { |