From 7d39f94f3d128051bb924d8135a392a30d4e0035 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Fri, 24 Mar 2017 11:05:22 +0100
Subject: [PATCH] Clang: Avoid warnings about unknown pragmas

Task-number: QTCREATORBUG-17460
Change-Id: Ic57f59f87b58c44ac738fb87039b4844d82bc924
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../cpptools/clangdiagnosticconfigsmodel.cpp      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
index 4ecdda76f5f..859d88a879a 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
@@ -33,6 +33,11 @@
 
 namespace CppTools {
 
+static QStringList commonOptions()
+{
+    return { QStringLiteral("-Wno-unknown-pragmas") };
+}
+
 static void addConfigForQuestionableConstructs(ClangDiagnosticConfigsModel &model)
 {
     ClangDiagnosticConfig config;
@@ -40,10 +45,10 @@ static void addConfigForQuestionableConstructs(ClangDiagnosticConfigsModel &mode
     config.setDisplayName(QCoreApplication::translate("ClangDiagnosticConfigsModel",
                                                       "Warnings for questionable constructs"));
     config.setIsReadOnly(true);
-    config.setCommandLineOptions({
+    config.setCommandLineOptions(QStringList{
         QStringLiteral("-Wall"),
         QStringLiteral("-Wextra"),
-    });
+    } + commonOptions());
 
     model.appendOrUpdate(config);
 }
@@ -55,7 +60,7 @@ static void addConfigForPedanticWarnings(ClangDiagnosticConfigsModel &model)
     config.setDisplayName(QCoreApplication::translate("ClangDiagnosticConfigsModel",
                                                       "Pedantic Warnings"));
     config.setIsReadOnly(true);
-    config.setCommandLineOptions({QStringLiteral("-Wpedantic")});
+    config.setCommandLineOptions(QStringList{QStringLiteral("-Wpedantic")} + commonOptions());
 
     model.appendOrUpdate(config);
 }
@@ -67,7 +72,7 @@ static void addConfigForAlmostEveryWarning(ClangDiagnosticConfigsModel &model)
     config.setDisplayName(QCoreApplication::translate("ClangDiagnosticConfigsModel",
                                                       "Warnings for almost everything"));
     config.setIsReadOnly(true);
-    config.setCommandLineOptions({
+    config.setCommandLineOptions(QStringList{
         QStringLiteral("-Weverything"),
         QStringLiteral("-Wno-c++98-compat"),
         QStringLiteral("-Wno-c++98-compat-pedantic"),
@@ -79,7 +84,7 @@ static void addConfigForAlmostEveryWarning(ClangDiagnosticConfigsModel &model)
         QStringLiteral("-Wno-documentation"),
         QStringLiteral("-Wno-shadow"),
         QStringLiteral("-Wno-missing-prototypes"), // Not optimal for C projects.
-    });
+    } + commonOptions());
 
     model.appendOrUpdate(config);
 }