Fix ExtendedRgb and Rgb encoding comparisons

ExtendedRgb should be treated as Rgb as it can be an automatic upgrade. Change-Id: I2942a1067ed5cacb2f60f303f467887cb44c36dd Reviewed-by: Eirik Aavitsland <[email protected]> (cherry picked from commit d80a98d) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
boris-fx · May 28, 2020 · cb34e43 · cb34e43
1 parent 6e695c0
commit cb34e43
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
@@ -2945,6 +2945,8 @@ QColor &QColor::operator=(Qt::GlobalColor color) noexcept
     Returns \c true if this color has the same color specification and component values as \a color;
     otherwise returns \c false.
 
+    ExtendedRgb and Rgb specifications are considered matching in this context.
+
     \sa spec()
 */
 bool QColor::operator==(const QColor &color) const noexcept
@@ -2958,6 +2960,12 @@ bool QColor::operator==(const QColor &color) const noexcept
                     || ct.ahsl.lightness == USHRT_MAX
                     || color.ct.ahsl.lightness == USHRT_MAX)
                 && (qAbs(ct.ahsl.lightness - color.ct.ahsl.lightness)) < 50);
+    } else if ((cspec == ExtendedRgb || color.cspec == ExtendedRgb) &&
+               (cspec == color.cspec || cspec == Rgb || color.cspec == Rgb))  {
+        return qFuzzyCompare(alphaF(), color.alphaF())
+            && qFuzzyCompare(redF(), color.redF())
+            && qFuzzyCompare(greenF(), color.greenF())
+            && qFuzzyCompare(blueF(), color.blueF());
     } else {
         return (cspec == color.cspec
                 && ct.argb.alpha == color.ct.argb.alpha
@@ -2974,6 +2982,8 @@ bool QColor::operator==(const QColor &color) const noexcept
     Returns \c true if this color has different color specification or component values from
     \a color; otherwise returns \c false.
 
+    ExtendedRgb and Rgb specifications are considered matching in this context.
+
     \sa spec()
 */
 bool QColor::operator!=(const QColor &color) const noexcept

diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -106,6 +106,8 @@ private slots:
 
     void achromaticHslHue();
 
+    void equality();
+
     void premultiply();
     void unpremultiply_sse4();
     void qrgba64();
@@ -1645,6 +1647,24 @@ void tst_QColor::achromaticHslHue()
     QCOMPARE(hsl.hslHue(), -1);
 }
 
+void tst_QColor::equality()
+{
+    QColor red = Qt::red;
+    QColor black = Qt::black;
+
+    QCOMPARE(red, red);
+    QCOMPARE(black, black);
+    QVERIFY(red != black);
+
+    // Encodings must match
+    QVERIFY(red != red.toHsv());
+    QVERIFY(black.toHsl() != black);
+
+    // Except for ExtendedRgb and Rgb, as it can be an automatic upgrade.
+    QCOMPARE(red, red.toExtendedRgb());
+    QCOMPARE(black.toExtendedRgb(), black);
+}
+
 void tst_QColor::premultiply()
 {
     // Tests that qPremultiply(qUnpremultiply(x)) returns x.