summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-08-13 22:55:35 +0300
committerTobias Hunger <tobias.hunger@digia.com>2013-08-22 10:34:09 +0200
commit2fe1fec16b82561f2e4371bebe1b6d2c29e8fb96 (patch)
tree51e29f574b5df55830f4150b5c151c2e203771ec /src/plugins/vcsbase
parent2555c211585fd81f63b37a7166058c8371b991fd (diff)
downloadqt-creator-2fe1fec16b82561f2e4371bebe1b6d2c29e8fb96.tar.gz
VCS: Normalize newlines on checkout
Change-Id: I211e54348751618f67f04e0795573b055ddfe98b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r--src/plugins/vcsbase/checkoutjobs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp
index 6def0ade5f..364ecdf16c 100644
--- a/src/plugins/vcsbase/checkoutjobs.cpp
+++ b/src/plugins/vcsbase/checkoutjobs.cpp
@@ -138,8 +138,8 @@ void ProcessCheckoutJob::addStep(const QString &binary,
void ProcessCheckoutJob::slotOutput()
{
- const QByteArray data = d->process->readAllStandardOutput();
- const QString s = QString::fromLocal8Bit(data, data.endsWith('\n') ? data.size() - 1: data.size());
+ const QString s = Utils::SynchronousProcess::normalizeNewlines(
+ QString::fromLocal8Bit(d->process->readAllStandardOutput()));
if (debug)
qDebug() << s;
emit output(s);