Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e

1 files changed, 38 insertions, 0 deletions

diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp
index 796ff19673..df10cf1f33 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorcontroller.cpp
@@ -108,6 +108,44 @@ bool DiffEditorController::isIgnoreWhitespace() const
     return m_ignoreWhitespace;
 }
 
+// ### fixme: git-specific handling should be done in the git plugin:
+// Remove unexpanded branches and follows-tag, clear indentation
+// and create E-mail
+static void formatGitDescription(QString *description)
+{
+    QString result;
+    result.reserve(description->size());
+    foreach (QString line, description->split(QLatin1Char('\n'))) {
+        if (line.startsWith(QLatin1String("commit "))
+            || line.startsWith(QLatin1String("Branches: <Expand>"))) {
+            continue;
+        }
+        if (line.startsWith(QLatin1String("Author: ")))
+            line.replace(0, 8, QStringLiteral("From: "));
+        else if (line.startsWith(QLatin1String("    ")))
+            line.remove(0, 4);
+        result.append(line);
+        result.append(QLatin1Char('\n'));
+    }
+    *description = result;
+}
+
+QString DiffEditorController::contents() const
+{
+    QString result = m_description;
+    const int formattingOptions = DiffUtils::GitFormat;
+    if (formattingOptions & DiffUtils::GitFormat)
+        formatGitDescription(&result);
+
+    const QString diff = DiffUtils::makePatch(diffFiles(), formattingOptions);
+    if (!diff.isEmpty()) {
+        if (!result.isEmpty())
+            result += QLatin1Char('\n');
+        result += diff;
+    }
+    return result;
+}
+
 QString DiffEditorController::makePatch(bool revert, bool addPrefix) const
 {
     if (m_diffFileIndex < 0 || m_chunkIndex < 0)