diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-07-05 10:44:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-05 11:01:02 +0200 |
| commit | 0915f189e2b8916fb2adaaee98c66d84f7b881be (patch) | |
| tree | 2a00511befe12d7919e2695c2221b182261bf7d1 /src/tools/qdoc/doc.cpp | |
| parent | b4ed287dc3d3de2d3c761b4a53b4a7a18565ca28 (diff) | |
qdoc: The \br macro is promoted to a qdoc command
The \br macro, which is used to insert a line break in the output
text, is now promoted to be a qdoc command. For html, it outputs a
<br/>. For DITA XML it does nothing.
Task Nr: QTBUG-26435
Change-Id: Ie0542c9053f68473ccaa2f50ace74baa30f78dd0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/doc.cpp')
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index 268c20d690..b60563c7f3 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -82,6 +82,7 @@ enum { CMD_BADCODE, CMD_BASENAME, CMD_BOLD, + CMD_BR, CMD_BRIEF, CMD_C, CMD_CAPTION, @@ -199,6 +200,7 @@ static struct { { "badcode", CMD_BADCODE, 0 }, { "basename", CMD_BASENAME, 0 }, // ### don't document for now { "bold", CMD_BOLD, 0 }, + { "br", CMD_BR, 0 }, { "brief", CMD_BRIEF, 0 }, { "c", CMD_C, 0 }, { "caption", CMD_CAPTION, 0 }, @@ -644,6 +646,10 @@ void DocParser::parse(const QString& source, leavePara(); insertBaseName(getArgument()); break; + case CMD_BR: + leavePara(); + append(Atom::BR); + break; case CMD_BOLD: location().warning(tr("'\\bold' is deprecated. Use '\\b'")); case CMD_B: |