diff options
author | David Boddie <david.boddie@nokia.com> | 2011-02-03 20:05:16 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2011-02-03 20:05:16 (GMT) |
commit | 5ee75c4a483405180788b5a4986dce2cf9360d86 (patch) | |
tree | 7e717ff0167ef9332a37e224ff6b91019db29cda /tools/qdoc3/pagegenerator.cpp | |
parent | 74ad5ce57adedc91717ffd67e3e65b8f76d12052 (diff) | |
download | Qt-5ee75c4a483405180788b5a4986dce2cf9360d86.zip Qt-5ee75c4a483405180788b5a4986dce2cf9360d86.tar.gz Qt-5ee75c4a483405180788b5a4986dce2cf9360d86.tar.bz2 |
Added a configuration variable for the QML documentation file prefix.
This required a certain amount of refactoring to make the new
variable visible to the relevant parts of the code. I also moved
the fullDocumentLocation() function into the HtmlGenerator class,
where it belongs.
Task-number: QTBUG-17071
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
-rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 89ec6fe..d5564f7 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -206,15 +206,15 @@ QString PageGenerator::fileBase(const Node *node) const #ifdef QDOC_QML /* To avoid file name conflicts in the html directory, - we prepend "qml-" to the file name of QML element doc - files. + we prepend a prefix (by default, "qml-") to the file name of QML + element doc files. */ if ((p->subType() == Node::QmlClass) || (p->subType() == Node::QmlBasicType)) { if (!base.startsWith(QLatin1String("QML:"))) - base.prepend("qml-"); + base.prepend(outputPrefix(QLatin1String("QML"))); } -#endif +#endif if (!pp || pp->name().isEmpty() || pp->type() == Node::Fake) break; base.prepend(QLatin1Char('-')); |