summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/global/macros.qdocconf3
-rw-r--r--src/tools/qdoc/doc.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index 58d9a71c8c..71a9dc30d1 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -3,12 +3,11 @@ macro.Aring.HTML = "Å"
macro.aring.HTML = "å"
macro.Auml.HTML = "Ä"
macro.author = "\\b{Author:}"
-macro.br.HTML = "<br />"
macro.BR.HTML = "<br />"
macro.copyright.HTML = "&copy;"
macro.eacute.HTML = "&eacute;"
macro.gui = "\\b"
-macro.hr.HTML = "<hr />"
+macro.HR.HTML = "<hr />"
macro.iacute.HTML = "&iacute;"
macro.key = "\\b"
macro.menu = "\\b"
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: