Commit 854c0f2e authored by Yuchen Deng's avatar Yuchen Deng Committed by Tobias Hunger
Browse files

Git: Fixed launch gitk failed

Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: default avatarTobias Hunger <>
Sanity-Review: Qt Sanity Bot <>
parent 79f7703a
...@@ -1483,11 +1483,11 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR ...@@ -1483,11 +1483,11 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR
void GitClient::launchGitK(const QString &workingDirectory) void GitClient::launchGitK(const QString &workingDirectory)
{ {
const QString gitBinDirectory = gitBinaryPath(); const QFileInfo binaryInfo(gitBinaryPath());
QDir foundBinDir(gitBinDirectory); QDir foundBinDir(binaryInfo.dir());
const bool foundBinDirIsCmdDir = foundBinDir.dirName() == "cmd"; const bool foundBinDirIsCmdDir = foundBinDir.dirName() == "cmd";
QProcessEnvironment env = processEnvironment(); QProcessEnvironment env = processEnvironment();
if (tryLauchingGitK(env, workingDirectory, gitBinDirectory, foundBinDirIsCmdDir)) if (tryLauchingGitK(env, workingDirectory, foundBinDir.path(), foundBinDirIsCmdDir))
return; return;
if (!foundBinDirIsCmdDir) if (!foundBinDirIsCmdDir)
return; return;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment