feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile fix for Qt4

Browse Source 
Change-Id: I16cc2f6f9cc7ace7aa7fb34a340ea714b6ac9c3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Robert Loehning
2014-04-16 14:26:07 +02:00
committed by Jarek Kobus
parent 18fc5e3f91
commit 70e47527bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -963,8 +963,8 @@ void SideBySideDiffEditorWidget::showDiff()
blockNumber++; blockNumber++;
} }
} }
leftText.replace(QChar::CarriageReturn, QChar::Space); leftText.replace(QLatin1Char('\r'), QLatin1Char(' '));
rightText.replace(QChar::CarriageReturn, QChar::Space); rightText.replace(QLatin1Char('\r'), QLatin1Char(' '));
leftTexts += leftText; leftTexts += leftText;
rightTexts += rightText; rightTexts += rightText;
leftDocs.append(qMakePair(contextFileData.leftFileInfo, leftText)); leftDocs.append(qMakePair(contextFileData.leftFileInfo, leftText));