diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-08-05 14:59:10 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2014-08-26 20:07:40 +0200 |
commit | 4f2d1e2e048765b65cbe4511b408684f625c38fa (patch) | |
tree | e1adedfaf58d8af3cedce15e24c3d74fbc08a6d3 /src/tools | |
parent | 92c7cb815522ad1b31e98cc1e7adeabde58057da (diff) |
qdoc: Fix output of \br command
Since the \br was promoted from a macro to a QDoc command, its output
has been enclosed in extra paragraph end/start tags, adding to the
visible vertical space.
This change fixes the issue by not closing the paragraph when QDoc
encounters a \br command.
Also removes the now-obsolete \br and \hr macros, as they are both
proper commands. \BR and \HR substitute macros are kept.
Task-number: QTBUG-37361
Change-Id: Iabbefb6e79268419792ccba42386f6342ccd175d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qdoc/doc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index fcf5add514..752d3075d2 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -649,7 +649,7 @@ void DocParser::parse(const QString& source, append(Atom::CodeBad,getCode(CMD_BADCODE, marker)); break; case CMD_BR: - leavePara(); + enterPara(); append(Atom::BR); break; case CMD_BOLD: |