summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-02-03 13:15:31 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-03 15:14:17 +0000
commitbf7e066168af57eaaecc66fe983d92bcad3f2ce6 (patch)
tree08b886f08c80b41c19958d0c0f0fe2de8fb54205
parente62933b0343047e7ca2b5011dc0f988ab2df89cb (diff)
downloadqttools-bf7e066168af57eaaecc66fe983d92bcad3f2ce6.tar.gz
qdoc: Don't clear the warning count in single-exec mode
As the warning count and limit determine the exit code, in single-exec mode we need to keep track of the number of warnings for all documentation sets that are part of the build. This assumes that each documentation set retrives the warning limit from a shared location in the config. Fixes: QTBUG-90867 Change-Id: I7588a2a945094a02543a2cbd51ec5e3865666b47 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit 173ecc34a2e8cf33325703b381003799aaaa42cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/location.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qdoc/location.cpp b/src/qdoc/location.cpp
index ccaa19f77..d8f637eb3 100644
--- a/src/qdoc/location.cpp
+++ b/src/qdoc/location.cpp
@@ -325,7 +325,8 @@ void Location::initialize()
tabSize = config.getInt(CONFIG_TABSIZE);
programName = config.programName();
project = config.getString(CONFIG_PROJECT);
- warningCount = 0;
+ if (!config.singleExec())
+ warningCount = 0;
if (qEnvironmentVariableIsSet("QDOC_ENABLE_WARNINGLIMIT")
|| config.getBool(CONFIG_WARNINGLIMIT + Config::dot + "enabled"))
warningLimit = config.getInt(CONFIG_WARNINGLIMIT);