From 2fe1fec16b82561f2e4371bebe1b6d2c29e8fb96 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 13 Aug 2013 22:55:35 +0300 Subject: [PATCH] VCS: Normalize newlines on checkout Change-Id: I211e54348751618f67f04e0795573b055ddfe98b Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/checkoutjobs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp index 6def0ade5f6..364ecdf16c9 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);