diff options
| author | Alessandro Portale <[email protected]> | 2010-07-03 20:05:20 +0200 |
|---|---|---|
| committer | Alessandro Portale <[email protected]> | 2010-07-03 20:05:20 +0200 |
| commit | 679b5e91f13651d29abf1119ec473ced1ab0943c (patch) | |
| tree | 3ee309eac315ca7e3343ef2c713744b119003c75 /src/plugins/git/gitclient.cpp | |
| parent | 67f7b6bf6f066634644360664d4419b9ed2eec9c (diff) | |
User visible paths need to go through QDir::toNativeSeparators()
Task-number: QTCREATORBUG-1795
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -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 58d41653b85..41152faf3b6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -950,7 +950,7 @@ bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringLis QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, branchArgs, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Unable to run a 'git branch' command in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText)); + *errorMessage = tr("Unable to run a 'git branch' command in %1: %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); return false; } *output = commandOutputFromLocal8Bit(outputText); @@ -972,7 +972,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString & QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Unable to run 'git show' in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText)); + *errorMessage = tr("Unable to run 'git show' in %1: %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); return false; } *output = commandOutputFromLocal8Bit(outputText); @@ -992,7 +992,7 @@ bool GitClient::synchronousCleanList(const QString &workingDirectory, QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Unable to run 'git clean' in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText)); + *errorMessage = tr("Unable to run 'git clean' in %1: %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); return false; } // Filter files that git would remove |