diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 13:09:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 16:53:19 +0200 |
| commit | c7ec7cd2a1ae9bec31113fae1f1e549b2bf98e0b (patch) | |
| tree | fc81fba4e7815ea061da277cf3bcf3102866932f /src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h | |
| parent | 7947032e2d1d68b2c0f79874db7adcf560851f29 (diff) | |
| parent | 6132260da394a9627947f0fe6a279c20863b6ad2 (diff) | |
Merge branch 'wip/qt6' into wip/cmake
Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b
Diffstat (limited to 'src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h index 2765db2946..b636c42e63 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h @@ -236,7 +236,7 @@ private: QImage alphaMapForGlyph(glyph_t, QFixed) override; QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override; QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; - QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t, const QColor &color) override; glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed subPixelPosition, const QTransform &matrix, |