Merge remote-tracking branch 'origin/4.6'

 Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

1 files changed, 10 insertions, 0 deletions

diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 3f35640c78..8a0e03deb3 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -448,6 +448,7 @@ public:
         , m_projectPart(projectPart)
     {
         addLanguageOptions();
+        addGlobalDiagnosticOptions(); // Before addDiagnosticOptions() so users still can overwrite.
         addDiagnosticOptions();
         addGlobalOptions();
         addPrecompiledHeaderOptions();
@@ -546,6 +547,15 @@ private:
         addXclangArg("-plugin-arg-clang-lazy", "ignore-included-files");
     }
 
+    void addGlobalDiagnosticOptions()
+    {
+        m_options.append({
+            // Avoid undesired warnings from e.g. Q_OBJECT
+            QStringLiteral("-Wno-unknown-pragmas"),
+            QStringLiteral("-Wno-unknown-warning-option")
+        });
+    }
+
     void addGlobalOptions()
     {
         if (!m_projectPart.project)