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

DiffEditor: Fix compile

Browse Source 
Amends bf64af6f52.

Change-Id: I68cae9b6444156c9d4be3f54d09c3abd415fae91
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2023-02-06 06:44:40 +01:00
parent 37a86061d8
commit 82d2f02c3f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,7 +493,7 @@ static QString sideFileName(DiffSide side, const FileData &fileData)
: FileData::DeleteFile; : FileData::DeleteFile;
if (fileData.fileOperation == operation) if (fileData.fileOperation == operation)
return "/dev/null"; return "/dev/null";
const QString sideMarker = side == LeftSide ? "a/" : "b/"; const QString sideMarker = side == LeftSide ? QString("a/") : QString("b/");
return sideMarker + fileData.fileInfo[side].fileName; return sideMarker + fileData.fileInfo[side].fileName;
} }