ClangTools: Avoid warnings from Q_OBJECT, too

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

4 files changed, 13 insertions, 6 deletions

diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index e5f272097a..91bbbc5f0f 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -556,11 +556,7 @@ private:
 
     void addGlobalDiagnosticOptions()
     {
-        m_options.append({
-            // Avoid undesired warnings from e.g. Q_OBJECT
-            QStringLiteral("-Wno-unknown-pragmas"),
-            QStringLiteral("-Wno-unknown-warning-option")
-        });
+        m_options += CppTools::ClangDiagnosticConfigsModel::globalDiagnosticOptions();
     }
 
     void addGlobalOptions()
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
index 71cbc78bec..d91724392e 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -78,7 +78,8 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
 
     arguments << QString("-fsyntax-only")
               << QString("-serialize-diagnostics")
-              << QString(m_logFile);
+              << QString(m_logFile)
+              << ClangDiagnosticConfigsModel::globalDiagnosticOptions();
 
     const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode();
     if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
index 77ee0f481d..e1f65df4be 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
@@ -165,6 +165,15 @@ QVector<Core::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
     return changedConfigs;
 }
 
+QStringList ClangDiagnosticConfigsModel::globalDiagnosticOptions()
+{
+    return {
+        // Avoid undesired warnings from e.g. Q_OBJECT
+        QStringLiteral("-Wno-unknown-pragmas"),
+        QStringLiteral("-Wno-unknown-warning-option")
+    };
+}
+
 int ClangDiagnosticConfigsModel::indexOfConfig(const Core::Id &id) const
 {
     return Utils::indexOf(m_diagnosticConfigs, [&](const ClangDiagnosticConfig &config) {
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsmodel.h b/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
index f46cfebc2a..5b0f850f79 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
+++ b/src/plugins/cpptools/clangdiagnosticconfigsmodel.h
@@ -53,6 +53,7 @@ public:
     static QString displayNameWithBuiltinIndication(const ClangDiagnosticConfig &config);
     static QVector<Core::Id> changedOrRemovedConfigs(const ClangDiagnosticConfigs &oldConfigs,
                                                      const ClangDiagnosticConfigs &newConfigs);
+    static QStringList globalDiagnosticOptions();
 
 private:
     ClangDiagnosticConfigs m_diagnosticConfigs;