Merge "Support family names that end/start with space"

This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-02-09 10:23:49 +01:00 committed by Qt CI Bot
commit 3102d611bd

View File

@ -304,10 +304,12 @@ void QFontDatabasePrivate::invalidate()
emit static_cast<QGuiApplication *>(QCoreApplication::instance())->fontDatabaseChanged();
}
QtFontFamily *QFontDatabasePrivate::family(const QString &f, FamilyRequestFlags flags)
QtFontFamily *QFontDatabasePrivate::family(const QString &family, FamilyRequestFlags flags)
{
QtFontFamily *fam = nullptr;
const QString f = family.trimmed();
int low = 0;
int high = count;
int pos = count / 2;