diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-27 14:38:03 +0200 |
| commit | 25eb97d2d450fbfe761559f1ae87a2e88c8c6b2d (patch) | |
| tree | a96380908abb944ff374201321fa5a50d15b770a /src/gui/text/qtextdocument_p.h | |
| parent | fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f (diff) | |
| parent | 0d6b4b519272915c2690ee12d1834823747233ab (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
src/network/ssl/qsslsocket_openssl.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
| -rw-r--r-- | src/gui/text/qtextdocument_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index df00fb7d84..f4e7a25f22 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -397,6 +397,7 @@ private: void emitPageBreakPolicy(QTextFormat::PageBreakFlags policy); void emitFontFamily(const QString &family); + void emitFontFamily(const QStringList &families); void emitBackgroundAttribute(const QTextFormat &format); QString findUrlForImage(const QTextDocument *doc, qint64 cacheKey, bool isPixmap); |