diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-07-17 12:54:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-17 12:55:01 +0200 |
| commit | bc823443ea30a30a1223c84c63338fe42fc6d31c (patch) | |
| tree | 20be53f8f6caae1bc7f3b5c1b7755723d1a543d6 /src/plugins/git | |
| parent | e7ea94b6883816b467ba15bf919448503935e302 (diff) | |
| download | qt-creator-bc823443ea30a30a1223c84c63338fe42fc6d31c.tar.gz | |
Fix broken merge
Change-Id: I21822285d2213a24ea80bb4a03c75a2cee5d4a9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index f04fbe7cb8..21ff3e5e75 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2641,7 +2641,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) { Utils::FileName GitClient::gitBinDirectory() { - const QString git = gitBinaryPath(); + const QString git = gitBinaryPath().toString(); if (git.isEmpty()) return Utils::FileName(); |