diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 15:12:51 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-02 10:30:13 +0100 |
| commit | a1f4321bbba2f3bff24d753ce766be738dbfa61a (patch) | |
| tree | 4a9444c604517313d327c45bbab6bf4186db26e4 /src/gui/text/qtextdocument_p.h | |
| parent | 809a96d6d94a93046dc63dd6f52c51ae90c374f8 (diff) | |
QTextDocument: Give fontFamily() precedence over fontFamilies()
If the singular fontFamily() is given, then this is obviously the one to
be preferred over any plural fontFamilies(). Make sure it always ends up
first in the list of emitted font families.
Change-Id: I1e3b1ba29721c8298b1a0d4a1e1da49ba5b4e7ac
Fixes: QTBUG-80475
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
| -rw-r--r-- | src/gui/text/qtextdocument_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index f4e7a25f22..40252c93eb 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -396,7 +396,6 @@ private: void emitBorderStyle(QTextFrameFormat::BorderStyle style); void emitPageBreakPolicy(QTextFormat::PageBreakFlags policy); - void emitFontFamily(const QString &family); void emitFontFamily(const QStringList &families); void emitBackgroundAttribute(const QTextFormat &format); |