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

Fix broken merge

Browse Source 
Change-Id: I21822285d2213a24ea80bb4a03c75a2cee5d4a9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-07-17 12:54:43 +02:00
parent e7ea94b688
commit bc823443ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2641,7 +2641,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) {
Utils::FileName GitClient::gitBinDirectory() Utils::FileName GitClient::gitBinDirectory()
{ {
const QString git = gitBinaryPath(); const QString git = gitBinaryPath().toString();
if (git.isEmpty()) if (git.isEmpty())
return Utils::FileName(); return Utils::FileName();