diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-06-21 09:58:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 12:50:08 +0200 |
| commit | cb74f7b22c2f4148287c40ab7308a6b7414237c5 (patch) | |
| tree | f4052370e0db26190c1f8104ca0d30a571c820b2 /src | |
| parent | fd1b7b4cac63e80b2fd93680287c44ab91f8faca (diff) | |
QDoc: Use 'Type' instead of 'element' in instantiates.
On a C++ documentation page "is instantiated by QML element" was printed
when you have a QML Type that instantiates this class. The text is now
changed to "is instantiated by QML Type".
Change-Id: I6c93531edc6ef9ac112573034fd54fa52390bc37
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 794ecf1225..da036a3385 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -4768,7 +4768,7 @@ void DitaXmlGenerator::generateQmlSince(const Node* node) } /*! - Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]" + Output the "[QmlGraphicsXxx is instantiated by QML Type Xxx]" line for the class, if there should be one. If there is no QML element, or if the class node status @@ -4786,7 +4786,7 @@ void DitaXmlGenerator::generateInstantiatedBy(ClassNode* cn, CodeMarker* marker) text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK); text << Atom(Atom::String, cn->name()); text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - text << " is instantiated by QML element "; + text << " is instantiated by QML Type "; text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn)); text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK); text << Atom(Atom::String, qcn->name()); diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 991aae0306..870acf488a 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -4250,7 +4250,7 @@ void HtmlGenerator::generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marke } /*! - Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]" + Output the "[QmlGraphicsXxx is instantiated by QML Type Xxx]" line for the class, if there should be one. If there is no QML element, or if the class node status @@ -4266,7 +4266,7 @@ void HtmlGenerator::generateInstantiatedBy(ClassNode* cn, CodeMarker* marker) text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK); text << Atom(Atom::String, cn->name()); text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - text << " is instantiated by QML element "; + text << " is instantiated by QML Type "; text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn)); text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK); text << Atom(Atom::String, qcn->name()); |