From 962ea69a1fe61cca39f3e728dd150ccefb11f6b3 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Fri, 29 Nov 2019 09:52:02 +0100
Subject: ClangTools: Fix invocation for plugin runner

This was forgotten when the new default clang-tidy and clazy diagnostic
config was introduced.

Change-Id: Ic8a82ec2b06178a623ac1d1e50dcbc2b3d0174da
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/plugins/clangtools/clangtidyclazyrunner.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
index dcee2bd15c..08bb13b478 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -61,12 +61,10 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo
 {
     QStringList arguments;
 
-    const QString clazyChecks = diagnosticConfig.clazyChecks();
-    if (!clazyChecks.isEmpty()) {
-        arguments << XclangArgs({"-add-plugin",
-                                 "clazy",
-                                 "-plugin-arg-clazy",
-                                 diagnosticConfig.clazyChecks()});
+    if (diagnosticConfig.isClazyEnabled()) {
+        arguments << XclangArgs({"-add-plugin", "clazy"});
+        if (!diagnosticConfig.clazyChecks().isEmpty())
+            arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()});
     }
 
     return arguments;
-- 
cgit v1.2.1