ClangTools: Allow selecting diagnostic config for project

When starting the Clazy/Tidy tool, allow to select the diagnostic
configuration for the run.

As a side effect, fix a race condition where the runner could end up
with no diagnostic config (removed during run) - copy the diagnostic
config instead of referencing/querying it by the id.

Change-Id: Iedafa8f31a3bbd233d65818fe8de16add1e4d443
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/clangtools/clangtidyclazyrunner.h b/src/plugins/clangtools/clangtidyclazyrunner.h
index e723653192..507ac2977d 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.h
+++ b/src/plugins/clangtools/clangtidyclazyrunner.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <cpptools/clangdiagnosticconfig.h>
+
 #include "clangtoolrunner.h"
 
 namespace ClangTools {
@@ -35,12 +37,17 @@ class ClangTidyClazyRunner final : public ClangToolRunner
     Q_OBJECT
 
 public:
-    ClangTidyClazyRunner(const QString &clangExecutable,
+    ClangTidyClazyRunner(const CppTools::ClangDiagnosticConfig &diagnosticConfig,
+                         const QString &clangExecutable,
                          const QString &clangLogFileDir,
                          const Utils::Environment &environment,
                          QObject *parent = nullptr);
+
 protected:
     QStringList constructCommandLineArguments(const QStringList &options) final;
+
+private:
+    const CppTools::ClangDiagnosticConfig m_diagnosticConfig;
 };
 
 } // namespace Internal