Merge remote-tracking branch 'origin/5.0'

Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
This commit is contained in:
Eike Ziller
2021-09-13 15:36:51 +02:00
98 changed files with 1321 additions and 445 deletions

View File

@@ -123,7 +123,14 @@ bool SymbolInformation::operator<(const SymbolInformation &other) const
return false;
}
int cmp = name().compare(other.name());
// The desired behavior here is to facilitate case insensitive
// sorting without generating false case sensitive equalities.
// Performance should be appropriate since in C++ there aren't
// many symbols that differ by case only.
int cmp = name().compare(other.name(), Qt::CaseInsensitive);
if (cmp == 0)
cmp = name().compare(other.name());
if (cmp < 0)
return true;
if (cmp > 0)