forked from qt-creator/qt-creator
Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator
This commit is contained in:
@@ -1057,7 +1057,7 @@ static inline bool checkChunkLine(const QString &line, int *modifiedLineNumber,
|
|||||||
if (endPos == -1)
|
if (endPos == -1)
|
||||||
return false;
|
return false;
|
||||||
// the first chunk range applies to the original file, the second one to
|
// the first chunk range applies to the original file, the second one to
|
||||||
// the modified file, the one we're interested int
|
// the modified file, the one we're interested in
|
||||||
const int plusPos = line.indexOf(QLatin1Char('+'), len);
|
const int plusPos = line.indexOf(QLatin1Char('+'), len);
|
||||||
if (plusPos == -1 || plusPos > endPos)
|
if (plusPos == -1 || plusPos > endPos)
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user