diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-05-07 15:40:14 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-05-14 07:03:04 +0000 |
| commit | 92fdbdc404271a4f8638f6831ada448ce830eb72 (patch) | |
| tree | d1270b4327079a59d76b4e03079bce5e091885f1 /src/plugins/clangtools/clangtidyclazyrunner.cpp | |
| parent | 3737b6a12468ef4edf3eadf531203914d081e622 (diff) | |
ClangTools: Use separate diagnostic settings for ClangTools
Share diagnostic configuration profiles between
ClangTools and ClangCodeModel but keep the unique
configuration index for each of them.
Change-Id: I86d95f7f220e929d60a53f3633167adfcd62a2da
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/clangtools/clangtidyclazyrunner.cpp')
| -rw-r--r-- | src/plugins/clangtools/clangtidyclazyrunner.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp index c3418525c4..9c524cf2c5 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp @@ -25,10 +25,13 @@ #include "clangtidyclazyrunner.h" +#include "clangtoolssettings.h" + #include <cpptools/cppcodemodelsettings.h> #include <cpptools/cpptoolsreuse.h> #include <utils/synchronousprocess.h> +#include <utils/qtcassert.h> #include <QDebug> #include <QDir> @@ -75,7 +78,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis << QString("-serialize-diagnostics") << QString(m_logFile); - const ClangDiagnosticConfig config = CppTools::codeModelSettings()->clangDiagnosticConfig(); + const ClangDiagnosticConfigsModel configsModel( + CppTools::codeModelSettings()->clangCustomDiagnosticConfigs()); + const Core::Id configId = ClangToolsSettings::instance()->savedDiagnosticConfigId(); + QTC_ASSERT(configsModel.hasConfigWithId(configId), return arguments;); + + const ClangDiagnosticConfig &config = configsModel.configWithId(configId); const ClangDiagnosticConfig::TidyMode tidyMode = config.clangTidyMode(); if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { |