diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-07-18 14:04:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-18 14:04:51 +0200 |
| commit | c571ecbd5106abebdd3f5867d53147e8b4b00f89 (patch) | |
| tree | 6c354316a35161600a423a9c823113f366bdc666 /src/plugins/git/changeselectiondialog.cpp | |
| parent | 292cf6c9e87d2c293be6eb2808530dbbd728c8b6 (diff) | |
| parent | 7dfb7df471ef81a20f45693a2c54a130aca5786a (diff) | |
| download | qt-creator-c571ecbd5106abebdd3f5867d53147e8b4b00f89.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/git/changeselectiondialog.cpp
src/plugins/git/changeselectiondialog.h
src/plugins/git/gerrit/gerritplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/git/gitclient.h
src/plugins/git/gitsettings.cpp
src/plugins/git/gitsettings.h
src/plugins/git/mergetool.cpp
Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
Diffstat (limited to 'src/plugins/git/changeselectiondialog.cpp')
| -rw-r--r-- | src/plugins/git/changeselectiondialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 39ba5bb008..c3d5d5f838 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -58,7 +58,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co , m_command(NoCommand) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - m_gitBinaryPath = GitPlugin::instance()->gitClient()->gitBinaryPath(); + m_gitExecutable = GitPlugin::instance()->gitClient()->gitExecutable(); m_ui->setupUi(this); m_ui->workingDirectoryEdit->setText(workingDirectory); m_gitEnvironment = GitPlugin::instance()->gitClient()->processEnvironment(); @@ -257,7 +257,7 @@ void ChangeSelectionDialog::recalculateDetails() connect(m_process, SIGNAL(finished(int)), this, SLOT(setDetails(int))); - m_process->start(m_gitBinaryPath.toString(), args); + m_process->start(m_gitExecutable.toString(), args); m_process->closeWriteChannel(); if (!m_process->waitForStarted()) m_ui->detailsText->setPlainText(tr("Error: Could not start Git.")); |