From 4f2d1e2e048765b65cbe4511b408684f625c38fa Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 5 Aug 2014 14:59:10 +0200 Subject: 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 --- doc/global/macros.qdocconf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') 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 = "
" macro.BR.HTML = "
" macro.copyright.HTML = "©" macro.eacute.HTML = "é" macro.gui = "\\b" -macro.hr.HTML = "
" +macro.HR.HTML = "
" macro.iacute.HTML = "í" macro.key = "\\b" macro.menu = "\\b" -- cgit v1.2.3