diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-28 16:08:45 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-06-28 14:12:00 +0000 |
| commit | 218457786df392a02f93dd019d1c91203bd4dc1c (patch) | |
| tree | 8e2822c170df00de9bd910f29a0b57923e8b8d1d /src/plugins/diffeditor/diffutils.cpp | |
| parent | 70283a9ea60c6bb02015800c614b5d5b4461d02e (diff) | |
| download | qt-creator-218457786df392a02f93dd019d1c91203bd4dc1c.tar.gz | |
DiffEditor: Fix build
diffutils.cpp: In function 'QList<DiffEditor::RowData>
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 <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<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); |