From 178fe102e893abe3da8dd9357c44b5b04ba6a6ed Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 17 Mar 2009 13:00:22 +0100
Subject: [PATCH] Fixes: Suppress colors for git diff project, class names in
widget template
---
share/qtcreator/templates/qt4project/widget.ui | 2 +-
src/plugins/git/gitclient.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/templates/qt4project/widget.ui b/share/qtcreator/templates/qt4project/widget.ui
index f4e94939e46..a804f2044eb 100644
--- a/share/qtcreator/templates/qt4project/widget.ui
+++ b/share/qtcreator/templates/qt4project/widget.ui
@@ -1,5 +1,5 @@
<ui version="4.0">
- <class>%CLASS%Class</class>
+ <class>%CLASS%</class>
<widget class="%BASECLASS%" name="%CLASS%" >
<property name="geometry" >
<rect>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 8baabe03a2a..c7558f1a18f 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -235,9 +235,9 @@ void GitClient::diff(const QString &workingDirectory,
if (Git::Constants::debug)
qDebug() << "diff" << workingDirectory << fileName;
QStringList arguments;
- arguments << QLatin1String("diff");
+ arguments << QLatin1String("diff") << QLatin1String(noColorOption);
if (!fileName.isEmpty())
- arguments << diffArgs << QLatin1String(noColorOption) << QLatin1String("--") << fileName;
+ arguments << diffArgs << QLatin1String("--") << fileName;
const QString kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND);
const QString title = tr("Git Diff %1").arg(fileName);
--
GitLab