diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-02-06 15:09:45 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-03-19 16:30:40 +0000 |
| commit | aea692f6ab9b22dabfeb8aadadc533ec9b95888b (patch) | |
| tree | d8dede8d5152222b31388c2da7140b365ef56afa /src/app/qbs/commandlinefrontend.cpp | |
| parent | b2adf96ad714a87895ebc2c975dfd262c87f4eb6 (diff) | |
remove Qt4 work-arounds
QStringList::join supports QLatin1Char arguments in Qt5.
Change-Id: Ic840473f0cb54c8c2a781bec3356c3c3c8e113af
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/app/qbs/commandlinefrontend.cpp')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 7e7f3e510..c4ec96b04 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -299,10 +299,10 @@ void CommandLineFrontend::handleProcessResultReport(const qbs::ProcessResult &re (result.success() ? qbsInfo() : qbsError()) << QDir::toNativeSeparators(result.executableFilePath()) << " " - << result.arguments().join(QLatin1String(" ")) + << result.arguments().join(QLatin1Char(' ')) << (hasOutput ? QString::fromLatin1("\n") : QString()) - << (result.stdOut().isEmpty() ? QString() : result.stdOut().join(QLatin1String("\n"))) - << (result.stdErr().isEmpty() ? QString() : result.stdErr().join(QLatin1String("\n"))); + << (result.stdOut().isEmpty() ? QString() : result.stdOut().join(QLatin1Char('\n'))) + << (result.stdErr().isEmpty() ? QString() : result.stdErr().join(QLatin1Char('\n'))); } bool CommandLineFrontend::resolvingMultipleProjects() const |