AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Restore QDoc's use of the \since

Browse Source 
-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>
This commit is contained in:
Jerome Pasion 2013-09-24 14:10:17 +02:00 committed by The Qt Project
parent 98c204a486
commit 6621188515
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/qdoc/generator.cpp
View File

@ -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(' ');
}

27
src/tools/qdoc/htmlgenerator.cpp
View File

@ -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;