diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 16:20:22 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 16:20:22 +0200 |
| commit | 36990a732eab2dc16bee89715662f6d3d8b3a0cd (patch) | |
| tree | d835ba67426e12e51dc1028e8ebac9087a3d43b0 /src/quick/scenegraph/qsgrhitextureglyphcache.cpp | |
| parent | cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b (diff) | |
| parent | d1b72c98b4e617530bfb23c3a5b7ebc68c15c089 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I507e252f9cb11b75dd9f7f409c39d93094e8c3ef
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 |