Commit 205d7fc

committed

Resolve use of qSort for Qt 6

1 parent ec224a3 commit 205d7fcCopy full SHA for 205d7fc

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1161,7 +1161,7 @@ int FastImportRepository::Transaction::commit()`
`1161`	`1161`	`mark_t i = !!parentmark; // if parentmark != 0, there's at least one parent`
`1162`	`1162`
`1163`	`1163`	`if(log.contains("This commit was manufactured by cvs2svn") && merges.count() > 1) {`
`1164`		`- qSort(merges);`
	`1164`	`+ std::sort(merges.begin(), merges.end());`
`1165`	`1165`	`repository->fastImport.write("merge :" + QByteArray::number(merges.last()) + "\n");`
`1166`	`1166`	`merges.pop_back();`
`1167`	`1167`	`qWarning() << "WARN: Discarding all but the highest merge point as a workaround for cvs2svn created branch/tag"`

Comments

(0)