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

Merge remote-tracking branch 'origin/master' into 4.4

Browse Source 
Change-Id: I071b3016e11f94c5421822935c13cecda7075f40
This commit is contained in:
Orgad Shaneh
2017-06-30 14:22:00 +03:00
parent c9345084c7 df61f12970
commit f55d3c5c6f
122 changed files with 1117 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffutils.cpp
View File

@@ -582,7 +582,7 @@ static QList<RowData> readLines(QStringRef patch,
break;
}
Diff diffToBeAdded(command, line.mid(1) + newLine);
Diff diffToBeAdded(command, line.mid(1).toString() + newLine);
if (!diffList.isEmpty() && diffList.last().command == command)
diffList.last().text.append(diffToBeAdded.text);