diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-07-29 09:50:09 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-07-31 14:03:10 +0000 |
commit | 1d9645576eab6cc316c7772b4f4b2c05f37e6ec2 (patch) | |
tree | 5efec55814564d168c7714c23110e6dfdffe3671 /src/quick/scenegraph/qsgrhitextureglyphcache_p.h | |
parent | 3cff8b2718ad182e39047a551ccdb8a72b2b2060 (diff) |
Re-enable colors with both gl and rhi glyph caches
Follow up to the 5.13->dev merge where the lack of the qt5 submodule
update made it impossible to use the new color argument.
Also implements the color argument for the rhi variant of the glyph
cache.
Change-Id: Ie6c6ba3d647335eb6173d0c9f7fbe3a4ed6b1f24
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgrhitextureglyphcache_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgrhitextureglyphcache_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h b/src/quick/scenegraph/qsgrhitextureglyphcache_p.h index 1533beb162..75d82de90d 100644 --- a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h +++ b/src/quick/scenegraph/qsgrhitextureglyphcache_p.h @@ -59,7 +59,8 @@ QT_BEGIN_NAMESPACE class QSGRhiTextureGlyphCache : public QImageTextureGlyphCache { public: - QSGRhiTextureGlyphCache(QRhi *rhi, QFontEngine::GlyphFormat format, const QTransform &matrix); + QSGRhiTextureGlyphCache(QRhi *rhi, QFontEngine::GlyphFormat format, const QTransform &matrix, + const QColor &color = QColor()); ~QSGRhiTextureGlyphCache(); void createTextureData(int width, int height) override; |