From: Gunnar Sletta Date: Tue, 13 Aug 2013 13:27:32 +0000 (+0200) Subject: Make compare check against the right color X-Git-Tag: upstream/5.2.1~689 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a6c99797eaad62564eedc3e3e931ce2becb05dc;p=platform%2Fupstream%2Fqtdeclarative.git Make compare check against the right color Change-Id: Ie23864c782ecdda26b68eb8813799aecae7bbb7e Reviewed-by: Eskil Abrahamsen Blomfeldt --- diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp index 0739a32..844b9c0 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp @@ -340,7 +340,7 @@ int QSGDistanceFieldStyledTextMaterial::compare(const QSGMaterial *o) const { Q_ASSERT(o && type() == o->type()); const QSGDistanceFieldStyledTextMaterial *other = static_cast(o); - if (m_styleColor != other->m_color) + if (m_styleColor != other->m_styleColor) return &m_styleColor < &other->m_styleColor ? -1 : 1; return QSGDistanceFieldTextMaterial::compare(o); }