diff options
| author | Yuchen Deng <loaden@gmail.com> | 2011-10-08 22:58:13 +0800 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-10-12 11:50:37 +0200 |
| commit | 854c0f2ed83f2623c72f491486642028734d3aae (patch) | |
| tree | 021b46e9ead1c668c71c7467330b5f954525d724 /src/plugins/git | |
| parent | 79f7703a0ba7e3ac27037f50c2b639af99bdcbde (diff) | |
| download | qt-creator-854c0f2ed83f2623c72f491486642028734d3aae.tar.gz | |
Git: Fixed launch gitk failed
Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 680c963303..ed79897f55 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1483,11 +1483,11 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR void GitClient::launchGitK(const QString &workingDirectory) { - const QString gitBinDirectory = gitBinaryPath(); - QDir foundBinDir(gitBinDirectory); + const QFileInfo binaryInfo(gitBinaryPath()); + QDir foundBinDir(binaryInfo.dir()); const bool foundBinDirIsCmdDir = foundBinDir.dirName() == "cmd"; QProcessEnvironment env = processEnvironment(); - if (tryLauchingGitK(env, workingDirectory, gitBinDirectory, foundBinDirIsCmdDir)) + if (tryLauchingGitK(env, workingDirectory, foundBinDir.path(), foundBinDirIsCmdDir)) return; if (!foundBinDirIsCmdDir) return; |