summaryrefslogtreecommitdiff
path: root/src/plugins/subversion/subversionplugin.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-05 15:45:41 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-05 15:45:41 +0100
commitc55b5b7b3176e5ee01abedafa448868fb6e4c315 (patch)
treea7eb098ebb9a2dee3a783f770e2ba587527c1684 /src/plugins/subversion/subversionplugin.cpp
parent59ecb9cf83313f82af857c7898dc075248d7668e (diff)
downloadqt-creator-c55b5b7b3176e5ee01abedafa448868fb6e4c315.tar.gz
Git/SVN: Ignore whitespace in annotation/blame (introduce setting).
Defaulting to true. Task-number: QTCREATORBUG-502
Diffstat (limited to 'src/plugins/subversion/subversionplugin.cpp')
-rw-r--r--src/plugins/subversion/subversionplugin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index e648f3163b..57ccc8f607 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -717,6 +717,8 @@ void SubversionPlugin::annotate(const QString &workingDir, const QString &file)
QTextCodec *codec = VCSBase::VCSBaseEditor::getCodec(file);
QStringList args(QLatin1String("annotate"));
+ if (m_settings.spaceIgnorantAnnotation)
+ args << QLatin1String("-x") << QLatin1String("-uw");
args.push_back(QLatin1String("-v"));
args.append(QDir::toNativeSeparators(file));