From 07b966623856fc392bea477848e8be17bd8314ea Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 10 Feb 2023 03:57:13 +0100 Subject: QDoc DocBook: allow deciding the use of extensions by qdocconf files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, this parameter could only be set from the command line. Now, it can also be set from a qdocconf file, like almost all other parameters. There was never a reason why it was read only from the command line. Pick-to: 6.5 Change-Id: Ib2877e8f4ef6155ac9434e982331de826d7df18c Reviewed-by: Paul Wicking Reviewed-by: Topi Reiniö --- src/qdoc/qdoc/docbookgenerator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qdoc/qdoc/docbookgenerator.cpp b/src/qdoc/qdoc/docbookgenerator.cpp index cd95f9f0b..2b96ed2a6 100644 --- a/src/qdoc/qdoc/docbookgenerator.cpp +++ b/src/qdoc/qdoc/docbookgenerator.cpp @@ -156,7 +156,8 @@ void DocBookGenerator::initializeGenerator() m_naturalLanguage = QLatin1String("en"); m_buildVersion = m_config->get(CONFIG_BUILDVERSION).asString(); - m_useDocBook52 = m_config->get(CONFIG_DOCBOOKEXTENSIONS).asBool(); + m_useDocBook52 = m_config->get(CONFIG_DOCBOOKEXTENSIONS).asBool() || + m_config->get(format() + Config::dot + "usedocbookextensions").asBool(); } QString DocBookGenerator::format() -- cgit v1.2.1