diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-27 11:02:48 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-27 12:46:55 +0000 |
| commit | 3e72fd9f4535f68815ef53a92cf97091302b6048 (patch) | |
| tree | e5b6d481bf3c2d42bf76cc35230e38b2e596d0b2 | |
| parent | 60e4c629126e29b0c12cbd993dce861e3629b428 (diff) | |
| download | qt-creator-3e72fd9f4535f68815ef53a92cf97091302b6048.tar.gz | |
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 <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/clangtools/clangtoolssettings.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |