Clang: Allow to forward warnings flags from build system

Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 6e3fa36817..3f44a977c9 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -99,12 +99,14 @@ CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart,
                                                UseSystemHeader useSystemHeader,
                                                UseTweakedHeaderPaths useTweakedHeaderPaths,
                                                UseLanguageDefines useLanguageDefines,
+                                               UseBuildSystemWarnings useBuildSystemWarnings,
                                                const QString &clangVersion,
                                                const QString &clangResourceDirectory)
     : m_projectPart(projectPart)
     , m_useSystemHeader(useSystemHeader)
     , m_useTweakedHeaderPaths(useTweakedHeaderPaths)
     , m_useLanguageDefines(useLanguageDefines)
+    , m_useBuildSystemWarnings(useBuildSystemWarnings)
     , m_clangVersion(clangVersion)
     , m_clangResourceDirectory(clangResourceDirectory)
 {
@@ -707,10 +709,11 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
             continue;
         }
 
-        // Ignore warning flags as these interfere with ouser user-configured diagnostics.
+        // Ignore warning flags as these interfere with our user-configured diagnostics.
         // Note that once "-w" is provided, no warnings will be emitted, even if "-Wall" follows.
-        if (option.startsWith("-w", Qt::CaseInsensitive)
-            || option.startsWith("/w", Qt::CaseInsensitive) || option.startsWith("-pedantic")) {
+        if (m_useBuildSystemWarnings == UseBuildSystemWarnings::No
+            && (option.startsWith("-w", Qt::CaseInsensitive)
+                || option.startsWith("/w", Qt::CaseInsensitive) || option.startsWith("-pedantic"))) {
             // -w, -W, /w, /W...
             continue;
         }