diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-04-08 12:58:17 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-04-09 06:02:22 +0000 |
| commit | 9d1905da9c59e9062a157199c81c076efc20eb28 (patch) | |
| tree | fe1feeacfa91e2515bf70bc4513bd36f72b2446d /src/gui | |
| parent | 28c9e0e606d104e526bb1c8e6e8bcda3ee0aa496 (diff) | |
Revert "Fix font matching of typographic families on Windows"
This reverts commit bcd2fa484a4fe93e77743195d7f72cce9e580d43.
There was a report that this caused infinite recursion on some
systems, so we revert it for now and re-add it later when the
issue has been resolved.
Task-number: QTBUG-74983
Change-Id: I747e0437232d72d7a87eb602b10fa09c7130ce8f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 7 | ||||
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 11 | ||||
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.h | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index ee37a84f5f..82e40510ae 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -804,13 +804,6 @@ QString qt_resolveFontFamilyAlias(const QString &alias) return alias; } -bool qt_isFontFamilyPopulated(const QString &familyName) -{ - QFontDatabasePrivate *d = privateDb(); - QtFontFamily *f = d->family(familyName, QFontDatabasePrivate::RequestFamily); - return f != nullptr && f->populated; -} - /*! Returns a list of alternative fonts for the specified \a family and \a style and \a script using the \a styleHint given. diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 715b00d838..a911014a19 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -60,7 +60,6 @@ void qt_registerFont(const QString &familyname, const QString &stylename, void qt_registerFontFamily(const QString &familyName); void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias); -bool qt_isFontFamilyPopulated(const QString &familyName); /*! Registers the pre-rendered QPF2 font contained in the given \a dataArray. @@ -667,16 +666,6 @@ void QPlatformFontDatabase::registerAliasToFontFamily(const QString &familyName, } /*! - Helper function that returns true if the font family has already been registered and populated. - - \since 5.14 -*/ -bool QPlatformFontDatabase::isFamilyPopulated(const QString &familyName) -{ - return qt_isFontFamilyPopulated(familyName); -} - -/*! \class QPlatformFontDatabase \since 5.0 \internal diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 38ba7f10b2..f4558129a7 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -139,8 +139,6 @@ public: static void registerFontFamily(const QString &familyName); static void registerAliasToFontFamily(const QString &familyName, const QString &alias); - - static bool isFamilyPopulated(const QString &familyName); }; QT_END_NAMESPACE |