feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Suppress colors for git diff project, class names in widget template

Browse Source
This commit is contained in:
Friedemann Kleint
2009-03-17 13:00:22 +01:00
parent 465bf149d5
commit 178fe102e8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/qt4project/widget.ui
View File

@@ -1,5 +1,5 @@
<ui version="4.0"> <ui version="4.0">
<class>%CLASS%Class</class> <class>%CLASS%</class>
<widget class="%BASECLASS%" name="%CLASS%" > <widget class="%BASECLASS%" name="%CLASS%" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>

4
src/plugins/git/gitclient.cpp
View File

@@ -235,9 +235,9 @@ void GitClient::diff(const QString &workingDirectory,
if (Git::Constants::debug) if (Git::Constants::debug)
qDebug() << "diff" << workingDirectory << fileName; qDebug() << "diff" << workingDirectory << fileName;
QStringList arguments; QStringList arguments;
arguments << QLatin1String("diff"); arguments << QLatin1String("diff") << QLatin1String(noColorOption);
if (!fileName.isEmpty()) 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 kind = QLatin1String(Git::Constants::GIT_DIFF_EDITOR_KIND);
const QString title = tr("Git Diff %1").arg(fileName); const QString title = tr("Git Diff %1").arg(fileName);