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

VCS[git]: Add arguments setting for gitk, add to locator.

Browse Source 
Task-number: QTCREATORBUG-1577
This commit is contained in:
Friedemann Kleint
2010-06-16 09:05:50 +02:00
parent f96efa07e1
commit 6793f1f962
6 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1272,12 +1272,14 @@ void GitClient::launchGitK(const QString &workingDirectory)
#ifdef Q_OS_WIN
// Launch 'wish' shell from git binary directory with the gitk located there
const QString binary = gitBinDirectory + QLatin1String("/wish");
const QStringList arguments(gitBinDirectory + QLatin1String("/gitk"));
QStringList arguments(gitBinDirectory + QLatin1String("/gitk"));
#else
// Simple: Run gitk from binary path
const QString binary = gitBinDirectory + QLatin1String("/gitk");
const QStringList arguments;
QStringList arguments;
#endif
if (!m_settings.gitkOptions.isEmpty())
arguments.append(m_settings.gitkOptions.split(QLatin1Char(' ')));
outwin->appendCommand(workingDirectory, binary, arguments);
// This should always use QProcess::startDetached (as not to kill
// the child), but that does not have an environment parameter.