diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2021-02-09 10:23:49 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-11 13:09:00 +0000 |
| commit | 3102d611bded33a5c15f63ece9e6f2eeb5940818 (patch) | |
| tree | 3eed2515147c45c1e4df83bd07ffa71a2ecf99e9 | |
| parent | aa9b4bd01ea030908a1a8d7e625ed4e946159f57 (diff) | |
| parent | 7fd9ed32012bd9001e78ad692a4802e0e3366e44 (diff) | |
Merge "Support family names that end/start with space"
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 1968838691..b35cef6a9a 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -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; |