diff options
| author | Oswald Buddenhagen <[email protected]> | 2010-10-19 11:14:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2010-11-17 13:19:07 +0100 |
| commit | 1e362b0f8b0dfd712337df35cd26c5dc98dfc294 (patch) | |
| tree | dbb61c65fc1c3e84b507e03c2b3f62a36acd6488 /src/plugins/git/gitclient.cpp | |
| parent | 531c70f05bfc8355f856f2af41be533fb13b85e6 (diff) | |
overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.
Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index fad4e9391ea..3bf8ccdfac7 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -49,6 +49,7 @@ #include <texteditor/itexteditor.h> #include <utils/qtcassert.h> +#include <utils/qtcprocess.h> #include <utils/synchronousprocess.h> #include <utils/environment.h> #include <vcsbase/vcsbaseeditor.h> @@ -1352,7 +1353,7 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, #endif VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance(); if (!m_settings.gitkOptions.isEmpty()) - arguments.append(m_settings.gitkOptions.split(QLatin1Char(' '))); + arguments.append(Utils::QtcProcess::splitArgs(m_settings.gitkOptions)); 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. |