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-10 21:49:32 +0200 |
commit | 9e32b23a1514f367921b4a9ee25bc864a008463c (patch) | |
tree | d835ba67426e12e51dc1028e8ebac9087a3d43b0 /src/quick/scenegraph/qsgdefaultglyphnode.cpp | |
parent | cb37a1d0c3fce7951f5d7f1fb4a04f90e038f01b (diff) | |
parent | 36990a732eab2dc16bee89715662f6d3d8b3a0cd (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultglyphnode.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode.cpp b/src/quick/scenegraph/qsgdefaultglyphnode.cpp index ba286b8a36..5bd5cc4891 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode.cpp @@ -76,7 +76,7 @@ void QSGDefaultGlyphNode::update() QMargins margins(0, 0, 0, 0); if (m_style == QQuickText::Normal) { - m_material = new QSGTextMaskMaterial(m_context, font); + m_material = new QSGTextMaskMaterial(m_context, QVector4D(m_color.redF(), m_color.greenF(), m_color.blueF(), m_color.alphaF()), font); } else if (m_style == QQuickText::Outline) { QSGOutlinedTextMaterial *material = new QSGOutlinedTextMaterial(m_context, font); material->setStyleColor(m_styleColor); |