From 70e47527bc8f23fe41f32eeadbdec75cf90d50a2 Mon Sep 17 00:00:00 2001 From: Robert Loehning <robert.loehning@digia.com> Date: Wed, 16 Apr 2014 14:26:07 +0200 Subject: [PATCH] Compile fix for Qt4 Change-Id: I16cc2f6f9cc7ace7aa7fb34a340ea714b6ac9c3f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> --- src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index f33f9bb813c..47fd559d2dd 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -963,8 +963,8 @@ void SideBySideDiffEditorWidget::showDiff() blockNumber++; } } - leftText.replace(QChar::CarriageReturn, QChar::Space); - rightText.replace(QChar::CarriageReturn, QChar::Space); + leftText.replace(QLatin1Char('\r'), QLatin1Char(' ')); + rightText.replace(QLatin1Char('\r'), QLatin1Char(' ')); leftTexts += leftText; rightTexts += rightText; leftDocs.append(qMakePair(contextFileData.leftFileInfo, leftText)); -- GitLab