1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-02-09 10:23:49 +01:00 committed by Qt CI Bot
commit 3102d611bd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qfontdatabase.cpp
View File

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