diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 10:30:38 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 10:30:38 +0000 |
| commit | 3e8092d183270b17ac18296c06f4596ee4a86cf7 (patch) | |
| tree | 8176377990c51fa191b94c12746956517fe8e00e /src/gui | |
| parent | e2720700471c8eca132bc6057a6a6cb563a776cf (diff) | |
| parent | 70251867a50f9f606a7ceaf2338375a67e413b83 (diff) | |
Merge integration refs/builds/qtci/dev/1616659664
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/freetype/qfontengine_ft_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/freetype/qfontengine_ft_p.h b/src/gui/text/freetype/qfontengine_ft_p.h index e9234e7d69..03059c7d13 100644 --- a/src/gui/text/freetype/qfontengine_ft_p.h +++ b/src/gui/text/freetype/qfontengine_ft_p.h @@ -363,7 +363,7 @@ private: Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_RELOCATABLE_TYPE); -inline size_t qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g, size_t seed) +inline size_t qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g, size_t seed = 0) { return qHashMulti(seed, g.glyph, |