diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-24 10:25:52 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-12-03 13:23:26 +0000 |
commit | 7d851c12ed8aea18fdc40cb3946d38e7ae9a76cf (patch) | |
tree | 5e816c18391c443b168a0e487f0280781d9d64eb /src/plugins/cpptools/clangdiagnosticconfig.cpp | |
parent | 0d7a30cdfe3f9611ce0653c556cc5a8d673ee061 (diff) |
ClangTools: Remove pointless "Disable" setting for clang-tidy
...as unchecking the root item in the tree has the same effect.
Change-Id: I960ea2c09a71dad3b0ba3dfb38a19055653354cd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/plugins/cpptools/clangdiagnosticconfig.cpp')
-rw-r--r-- | src/plugins/cpptools/clangdiagnosticconfig.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/cpptools/clangdiagnosticconfig.cpp b/src/plugins/cpptools/clangdiagnosticconfig.cpp index 032d980316..51cf125366 100644 --- a/src/plugins/cpptools/clangdiagnosticconfig.cpp +++ b/src/plugins/cpptools/clangdiagnosticconfig.cpp @@ -190,10 +190,14 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s) config.setId(Core::Id::fromSetting(s->value(diagnosticConfigIdKey))); config.setDisplayName(s->value(diagnosticConfigDisplayNameKey).toString()); config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList()); - config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>( - s->value(diagnosticConfigsTidyModeKey).toInt())); - config.setClangTidyChecks( - s->value(diagnosticConfigsTidyChecksKey).toString()); + const int tidyModeValue = s->value(diagnosticConfigsTidyModeKey).toInt(); + if (tidyModeValue == 0) { // Convert from settings of <= Qt Creator 4.10 + config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList); + config.setClangTidyChecks("-*"); + } else { + config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(tidyModeValue)); + config.setClangTidyChecks(s->value(diagnosticConfigsTidyChecksKey).toString()); + } config.setClazyMode(static_cast<ClangDiagnosticConfig::ClazyMode>( s->value(diagnosticConfigsClazyModeKey).toInt())); |