From 218457786df392a02f93dd019d1c91203bd4dc1c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 28 Jun 2017 16:08:45 +0200 Subject: DiffEditor: Fix build diffutils.cpp: In function 'QList DiffEditor::readLines(QStringRef, bool, bool*, bool*)': diffutils.cpp:585:53: error: no match for 'operator+' (operand types are 'QStringRef' and 'const QChar') Change-Id: I44ad2237c033266d3832ce95174ec056ff7cae9f Reviewed-by: Orgad Shaneh --- src/plugins/diffeditor/diffutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/diffeditor/diffutils.cpp') diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index a7e6b32219..8793132916 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -582,7 +582,7 @@ static QList 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); -- cgit v1.2.1