From 3e72fd9f4535f68815ef53a92cf97091302b6048 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 27 Nov 2019 11:02:48 +0100 Subject: ClangTools: Fix converting old settings on Windows As the settings keys are case-insensitive on Windows, the condition s->value(oldDiagnosticConfigIdKey).isNull() in ClangToolsSettings::readSettings always evaluated to true, leaving inconsistent settings around (new and old). As a result, the QTC_ASSERT parallelRuns >= 1 was triggered in ClangToolRunWorker::start() and nothing was analyzed. Fix by using a truly different settings key after conversion. Change-Id: I467f7d71298f240812a56dfcf7d6ca81728dee32 Reviewed-by: Cristian Adam Reviewed-by: David Schulz --- src/plugins/clangtools/clangtoolssettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h index 36da00d293..aaa52011b1 100644 --- a/src/plugins/clangtools/clangtoolssettings.h +++ b/src/plugins/clangtools/clangtoolssettings.h @@ -34,7 +34,7 @@ namespace ClangTools { namespace Internal { -const char diagnosticConfigIdKey[] = "DiagnosticConfigId"; +const char diagnosticConfigIdKey[] = "DiagnosticConfig"; class RunSettings { -- cgit v1.2.1