1 files changed, 1 insertions, 37 deletions
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
index 166d1c94e0..8fbc09ff5a 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -53,28 +53,6 @@ static bool isClMode(const QStringList &options)
     return options.contains("--driver-mode=cl");
 }
 
-static QStringList serializeDiagnosticsArguments(const QStringList &baseOptions,
-                                                 const QString &outputFilePath)
-{
-    const QStringList serializeArgs{"-serialize-diagnostics", outputFilePath};
-    if (isClMode(baseOptions))
-        return clangArgsForCl(serializeArgs);
-    return serializeArgs;
-}
-
-static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticConfig)
-{
-    QStringList arguments;
-
-    if (diagnosticConfig.isClazyEnabled()) {
-        arguments << XclangArgs({"-add-plugin", "clazy"});
-        if (!diagnosticConfig.clazyChecks().isEmpty())
-            arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()});
-    }
-
-    return arguments;
-}
-
 static QStringList tidyChecksArguments(const ClangDiagnosticConfig diagnosticConfig)
 {
     const ClangDiagnosticConfig::TidyMode tidyMode = diagnosticConfig.clangTidyMode();
@@ -83,7 +61,7 @@ static QStringList tidyChecksArguments(const ClangDiagnosticConfig diagnosticCon
         return {"-config={}"};
     if (tidyMode == ClangDiagnosticConfig::TidyMode::UseCustomChecks)
         return {"-config={}", "-checks=" + diagnosticConfig.clangTidyChecks()};
-    return {};
+    return {"--warnings-as-errors=-*"};
 }
 
 static QStringList clazyChecksArguments(const ClangDiagnosticConfig diagnosticConfig)
@@ -147,19 +125,5 @@ ClazyStandaloneRunner::ClazyStandaloneRunner(const ClangDiagnosticConfig &config
     });
 }
 
-ClazyPluginRunner::ClazyPluginRunner(const ClangDiagnosticConfig &config, QObject *parent)
-    : ClangToolRunner(parent)
-{
-    setName(tr("Clazy"));
-    setOutputFileFormat(OutputFileFormat::Serialized);
-    setExecutable(Core::ICore::clangExecutable(CLANG_BINDIR));
-    setArgsCreator([this, config](const QStringList &baseOptions) {
-        return serializeDiagnosticsArguments(baseOptions, outputFilePath())
-            << clazyPluginArguments(config)
-            << clangArguments(config, baseOptions)
-            << QDir::toNativeSeparators(fileToAnalyze());
-    });
-}
-
 } // namespace Internal
 } // namespace ClangTools