diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-09-24 14:10:17 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-24 18:02:55 +0200 |
commit | 6621188515200d6c7001b17989e54bb9f59a43c2 (patch) | |
tree | 4b8fe1a102782fd35618e21aace26d49d2af87e6 /src/tools/qdoc | |
parent | 98c204a48616d8287ab2bdec2630ab0e4584a61d (diff) |
Doc: Restore QDoc's use of the \since
-one argument: assume it is the Qt version
-more than one argument: copy verbatim
Task-number: QTBUG-32172
Change-Id: Iaf5ec538f23abf4d1dfdf50bffcbbdede56d0b22
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc')
-rw-r--r-- | src/tools/qdoc/generator.cpp | 13 | ||||
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 27 |
2 files changed, 9 insertions, 31 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 0d4e563836..549b3a3918 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1120,17 +1120,10 @@ void Generator::generateSince(const Node *node, CodeMarker *marker) QStringList since = node->since().split(QLatin1Char(' ')); if (since.count() == 1) { - // Handle legacy use of \since <version>. - if (project.isEmpty()) - text << "version"; - else - text << Atom(Atom::Link, project) - << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK) - << Atom(Atom::String, project) - << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - text << " " << since[0]; + // If there is only one argument, assume it is the Qt version number. + text << " Qt " << since[0]; } else { - // Reconstruct the <project> <version> string. + // Otherwise, reconstruct the <project> <version> string. text << " " << since.join(' '); } diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 4a6d5ea9a8..697955629e 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1868,18 +1868,11 @@ void HtmlGenerator::generateRequisites(InnerNode *inner, CodeMarker *marker) text.clear(); QStringList since = inner->since().split(QLatin1Char(' ')); if (since.count() == 1) { - // Handle legacy use of \since <version>. - if (project.isEmpty()) - text << "version"; - else - text << Atom(Atom::Link, project) - << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK) - << Atom(Atom::String, project) - << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - text << " " << since[0]; + // If there is only one argument, assume it is the Qt version number. + text << " Qt " << since[0]; } else { - // Reconstruct the <project> <version> string. + //Otherwise, reconstruct the <project> <version> string. text << " " << since.join(' '); } text << Atom::ParaRight; @@ -2016,19 +2009,11 @@ void HtmlGenerator::generateQmlRequisites(QmlClassNode *qcn, CodeMarker *marker) text.clear(); QStringList since = qcn->since().split(QLatin1Char(' ')); if (since.count() == 1) { - // Handle legacy use of \since <version>. - if (project.isEmpty()) - text << "version"; - else - text << Atom(Atom::Link, project) - << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK) - << Atom(Atom::String, project) - << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - - text << " " << since[0]; + // If there is only one argument, assume it is the Qt version number. + text << " Qt " << since[0]; } else { - // Reconstruct the <project> <version> string. + //Otherwise, reconstruct the <project> <version> string. text << " " << since.join(' '); } text << Atom::ParaRight; |