diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 23:00:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-20 23:19:30 +0000 |
| commit | 9ef793ba9539b4eddb7893c0df9be6e211d9984f (patch) | |
| tree | 7b9374b8dcc8cbbc3b92636b2029f1b55c5e3194 /src/gui/text/qfontdatabase.h | |
| parent | e631e900fd0cd7467b1dccb5fa401afdcd1e41a8 (diff) | |
| parent | 7a252ac46780b6145084d8d5ca0549b2de3639cc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/gui/text/qfontdatabase.h')
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index e6aef493bd..80b092f177 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -160,8 +160,8 @@ private: static void createDatabase(); static void parseFontName(const QString &name, QString &foundry, QString &family); static QString resolveFontFamilyAlias(const QString &family); - static QFontEngine *findFont(const QFontDef &request, int script); - static void load(const QFontPrivate *d, int script); + static QFontEngine *findFont(const QFontDef &request, int script /* QChar::Script */); + static void load(const QFontPrivate *d, int script /* QChar::Script */); friend struct QFontDef; friend class QFontPrivate; |