summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Cuvelier <cuvelier.thibaut@gmail.com>2023-02-10 03:57:13 +0100
committerPaul Wicking <paul.wicking@qt.io>2023-04-26 14:43:34 +0200
commit07b966623856fc392bea477848e8be17bd8314ea (patch)
tree01451d685e9fea84517006145f94a386a8458e02
parent622a9676686e88038e9add7b60af365a0740ee35 (diff)
downloadqttools-07b966623856fc392bea477848e8be17bd8314ea.tar.gz
QDoc DocBook: allow deciding the use of extensions by qdocconf files
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 <paul.wicking@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/qdoc/qdoc/docbookgenerator.cpp3
1 files changed, 2 insertions, 1 deletions
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()