diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-09-25 16:27:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-09-25 16:30:09 +0200 |
| commit | 5d443a99dcb980978c07440f152b65a66e5093de (patch) | |
| tree | 0fcd91936174da899b2af84d8d5251c5b97d5ed3 /src/app/qbs/commandlinefrontend.cpp | |
| parent | d6d2c8a9b1b8eb9f6e4b5887018f4ccf45769739 (diff) | |
| parent | dcc4f9723e9e1daebc4ca634d57cd57ac4fbcc4f (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
qbs_version.pri
src/lib/corelib/language/evaluatorscriptclass.cpp
tests/auto/api/tst_api.cpp
version.js
Change-Id: I1d62398788b09a5bfd2399028e10fec70d58b96a
Diffstat (limited to 'src/app/qbs/commandlinefrontend.cpp')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 7f4a12440..481158d1f 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -279,7 +279,8 @@ void CommandLineFrontend::handleProcessResultReport(const qbs::ProcessResult &re return; (result.success() ? qbsInfo() : qbsError()) - << result.executableFilePath() << " " << result.arguments().join(QLatin1String(" ")) + << QDir::toNativeSeparators(result.executableFilePath()) << " " + << result.arguments().join(QLatin1String(" ")) << (hasOutput ? QString::fromLatin1("\n") : QString()) << (result.stdOut().isEmpty() ? QString() : result.stdOut().join(QLatin1String("\n"))) << (result.stdErr().isEmpty() ? QString() : result.stdErr().join(QLatin1String("\n"))); |