Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/quick/items/qquickitemsmodule.cpp
	tools/qml/main.cpp

Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136

1 files changed, 43 insertions, 6 deletions

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 9f1a44154c..14bc0fad07 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -267,6 +267,30 @@ void QSG24BitTextMaskShader::updateState(const RenderState &state, QSGMaterial *
     }
 }
 
+class QSG32BitColorTextShader : public QSGTextMaskShader
+{
+public:
+    QSG32BitColorTextShader(QFontEngine::GlyphFormat glyphFormat)
+        : QSGTextMaskShader(glyphFormat)
+    {
+        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/32bitcolortext.frag"));
+    }
+
+    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) Q_DECL_OVERRIDE;
+};
+
+void QSG32BitColorTextShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
+{
+    QSGTextMaskShader::updateState(state, newEffect, oldEffect);
+    QSGTextMaskMaterial *material = static_cast<QSGTextMaskMaterial *>(newEffect);
+    QSGTextMaskMaterial *oldMaterial = static_cast<QSGTextMaskMaterial *>(oldEffect);
+
+    if (oldMaterial == Q_NULLPTR || material->color() != oldMaterial->color() || state.isOpacityDirty()) {
+        float opacity = material->color().w() * state.opacity();
+        program()->setUniformValue(m_color_id, opacity);
+    }
+}
+
 class QSGStyledTextShader : public QSG8BitTextMaskShader
 {
 public:
@@ -497,8 +521,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
 
 QSGMaterialType *QSGTextMaskMaterial::type() const
 {
-    static QSGMaterialType rgb, gray;
-    return glyphCache()->glyphFormat() == QFontEngine::Format_A32 ? &rgb : &gray;
+    static QSGMaterialType argb, rgb, gray;
+    switch (glyphCache()->glyphFormat()) {
+    case QFontEngine::Format_ARGB:
+        return &argb;
+    case QFontEngine::Format_A32:
+        return &rgb;
+    case QFontEngine::Format_A8:
+    default:
+        return &gray;
+    }
 }
 
 QOpenGLTextureGlyphCache *QSGTextMaskMaterial::glyphCache() const
@@ -508,10 +540,15 @@ QOpenGLTextureGlyphCache *QSGTextMaskMaterial::glyphCache() const
 
 QSGMaterialShader *QSGTextMaskMaterial::createShader() const
 {
-    QFontEngine::GlyphFormat glyphFormat = glyphCache()->glyphFormat();
-    return glyphFormat == QFontEngine::Format_A32
-           ? (QSGMaterialShader *) new QSG24BitTextMaskShader(glyphFormat)
-           : (QSGMaterialShader *) new QSG8BitTextMaskShader(glyphFormat);
+    switch (QFontEngine::GlyphFormat glyphFormat = glyphCache()->glyphFormat()) {
+    case QFontEngine::Format_ARGB:
+        return new QSG32BitColorTextShader(glyphFormat);
+    case QFontEngine::Format_A32:
+        return new QSG24BitTextMaskShader(glyphFormat);
+    case QFontEngine::Format_A8:
+    default:
+        return new QSG8BitTextMaskShader(glyphFormat);
+    }
 }
 
 static inline int qsg_colorDiff(const QVector4D &a, const QVector4D &b)