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

src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp

@@ -165,7 +165,9 @@ private:
 
         QString text;
 
-        if (m_displayHints.showCategoryAndEnableOption)
+        // Diagnostics from clazy/tidy do not have any category or option set, so
+        // avoid to add an empty line.
+        if (m_displayHints.showCategoryAndEnableOption && !diagnostic.category.isEmpty())
             text.append(diagnosticCategoryAndEnableOptionRow(diagnostic));
         text.append(diagnosticRow(diagnostic, IndentMode::DoNotIndent));
         text.append(diagnosticRowsForChildren(diagnostic));

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)