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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgrhitextureglyphcache.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgrhitextureglyphcache.cpp b/src/quick/scenegraph/qsgrhitextureglyphcache.cpp index f181d101c6..99761302e2 100644 --- a/src/quick/scenegraph/qsgrhitextureglyphcache.cpp +++ b/src/quick/scenegraph/qsgrhitextureglyphcache.cpp @@ -43,8 +43,9 @@ QT_BEGIN_NAMESPACE -QSGRhiTextureGlyphCache::QSGRhiTextureGlyphCache(QRhi *rhi, QFontEngine::GlyphFormat format, const QTransform &matrix) - : QImageTextureGlyphCache(format, matrix), +QSGRhiTextureGlyphCache::QSGRhiTextureGlyphCache(QRhi *rhi, QFontEngine::GlyphFormat format, const QTransform &matrix, + const QColor &color) + : QImageTextureGlyphCache(format, matrix, color), m_rhi(rhi) { // Some OpenGL implementations, for instance macOS, have issues with |