From f21195b261af6e51fd52db1ac90384060760f8de Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 16 May 2024 10:20:21 +0000 Subject: [PATCH] Doc: Set trademarks page in global configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new \tm command appends a trademark symbol and links to the trademark documentation page if `navigation.trademarkspage` variable is set. As we have such a page in qtdoc repository, set the variable in the global configuration. This works as all Qt module docs have a dependency to the `qtdoc` documentation set. Task-number: QTBUG-124393 Change-Id: Iabc6e7e5afe5114eac79947f0feb512458f1c4da Reviewed-by: Topi Reiniö (cherry picked from commit 429f565017f7213a91eb0cf43966b2148e0bb651) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 3b4a7d4881a225f686cb2bd3b436947911dac331) --- doc/global/config.qdocconf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 1ed2160522f..f0b3fc0d02e 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -11,6 +11,9 @@ dita.metadata.default.audience = programmer navigation.homepage = index.html navigation.hometitle = "Qt $QT_VER" +# Set trademarks page (located in qt/qtdoc) +navigation.trademarkspage = Trademarks + #Words to ignore for auto-linking ignorewords += \ macOS \