diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-05-07 14:02:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-15 16:24:38 +0200 |
| commit | 97a86c50dc00551818e9fcef37908ef7ebfb242b (patch) | |
| tree | c6b064ca42e9f3a98987337730eaf8f678df082d /src/plugins/git/gitsettings.cpp | |
| parent | 60b1aaeae482ac8f9b74aa74d4a2053e47ee81be (diff) | |
| download | qt-creator-97a86c50dc00551818e9fcef37908ef7ebfb242b.tar.gz | |
Basic integration of diff editor inside git plugin
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitsettings.cpp')
| -rw-r--r-- | src/plugins/git/gitsettings.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index 2c1e27fc8a..7bacca1307 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -35,6 +35,7 @@ namespace Git { namespace Internal { +const QLatin1String GitSettings::useDiffEditorKey("UseDiffEditor"); const QLatin1String GitSettings::pullRebaseKey("PullRebase"); const QLatin1String GitSettings::showTagsKey("ShowTags"); const QLatin1String GitSettings::omitAnnotationDateKey("OmitAnnotationDate"); @@ -54,6 +55,7 @@ GitSettings::GitSettings() declareKey(binaryPathKey, QLatin1String("git")); declareKey(timeoutKey, Utils::HostOsInfo::isWindowsHost() ? 60 : 30); + declareKey(useDiffEditorKey, true); declareKey(pullRebaseKey, false); declareKey(showTagsKey, false); declareKey(omitAnnotationDateKey, false); |