From 562e74e3b4e5cb6944cfa1ef64a6ee5d9c015c69 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 18 Dec 2024 11:39:02 +0000 Subject: [PATCH] Doc: Modify \tabcontent..\endtabcontent macros QDoc markup following the \tabcontent macro should start a new paragraph. As HTML-specific macros are injected directly into the output, QDoc's doc parser is not aware that the macro should start a new paragraph. Turn the macros into generic, non-format-specific macros, expanding to \div and \enddiv commands that wrap the tab content. Pick-to: 6.8 6.5 Change-Id: Ie8313af391b1a38ef74592acac3198fef5b7b310 Reviewed-by: Venugopal Shivashankar (cherry picked from commit 5c0b08a20dd14f7fd8632495aa911fe427f58f7f) Reviewed-by: Qt Cherry-pick Bot --- doc/global/htmltabs.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/global/htmltabs.qdocconf b/doc/global/htmltabs.qdocconf index 164c71e9f07..3a41a64d220 100644 --- a/doc/global/htmltabs.qdocconf +++ b/doc/global/htmltabs.qdocconf @@ -38,8 +38,8 @@ # \endif macro.tab.HTML = "" -macro.tabcontent.HTML = "
" -macro.endtabcontent.HTML = "
" +macro.tabcontent = "\\div {class=\"tabcontent \1\"}" +macro.endtabcontent = "\\enddiv" HTML.extraimages += template/style/htmltabs.css