3 files changed, 10 insertions, 63 deletions

diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 8780cce223..c567b25468 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -855,18 +855,6 @@ QColor::QColor(Spec spec) noexcept
 */
 
 /*!
-    Returns the name of the color in the format "#RRGGBB"; i.e. a "#"
-    character followed by three two-digit hexadecimal numbers.
-
-    \sa setNamedColor()
-*/
-
-QString QColor::name() const
-{
-    return name(HexRgb);
-}
-
-/*!
     \since 5.2
 
     Returns the name of the color in the specified \a format.
@@ -1086,6 +1074,7 @@ void QColor::setHsvF(qreal h, qreal s, qreal v, qreal a)
         || (v < qreal(0.0) || v > qreal(1.0))
         || (a < qreal(0.0) || a > qreal(1.0))) {
         qWarning("QColor::setHsvF: HSV parameters out of range");
+        invalidate();
         return;
     }
 
@@ -1198,7 +1187,8 @@ void QColor::setHslF(qreal h, qreal s, qreal l, qreal a)
         || (s < qreal(0.0) || s > qreal(1.0))
         || (l < qreal(0.0) || l > qreal(1.0))
         || (a < qreal(0.0) || a > qreal(1.0))) {
-        qWarning("QColor::setHsvF: HSV parameters out of range");
+        qWarning("QColor::setHslF: HSL parameters out of range");
+        invalidate();
         return;
     }
 
@@ -1224,7 +1214,7 @@ void QColor::setHslF(qreal h, qreal s, qreal l, qreal a)
 void QColor::setHsl(int h, int s, int l, int a)
 {
     if (h < -1 || (uint)s > 255 || (uint)l > 255 || (uint)a > 255) {
-        qWarning("QColor::setHsv: HSV parameters out of range");
+        qWarning("QColor::setHsl: HSL parameters out of range");
         invalidate();
         return;
     }
@@ -2626,16 +2616,6 @@ QColor QColor::fromHslF(qreal h, qreal s, qreal l, qreal a)
 }
 
 /*!
-   \obsolete
-
-   Use the \c const overload instead.
-*/
-void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a)
-{
-    const_cast<const QColor *>(this)->getCmyk(c, m, y, k, a);
-}
-
-/*!
     Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the
     cyan, magenta, yellow, black, and alpha-channel (transparency) components
     of the color's CMYK value.
@@ -2665,16 +2645,6 @@ void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) const
 }
 
 /*!
-   \obsolete
-
-   Use the \c const overload instead.
-*/
-void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a)
-{
-    const_cast<const QColor *>(this)->getCmykF(c, m, y, k, a);
-}
-
-/*!
     Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the
     cyan, magenta, yellow, black, and alpha-channel (transparency) components
     of the color's CMYK value.
@@ -2719,6 +2689,7 @@ void QColor::setCmyk(int c, int m, int y, int k, int a)
         || k < 0 || k > 255
         || a < 0 || a > 255) {
         qWarning("QColor::setCmyk: CMYK parameters out of range");
+        invalidate();
         return;
     }
 
@@ -2748,6 +2719,7 @@ void QColor::setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a)
         || k < qreal(0.0) || k > qreal(1.0)
         || a < qreal(0.0) || a > qreal(1.0)) {
         qWarning("QColor::setCmykF: CMYK parameters out of range");
+        invalidate();
         return;
     }
 
@@ -2920,18 +2892,6 @@ QColor QColor::dark(int factor) const noexcept
 }
 #endif
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-/*!
-    Assigns a copy of \a color to this color, and returns a reference to it.
-*/
-QColor &QColor::operator=(const QColor &color) noexcept
-{
-    cspec = color.cspec;
-    ct.argb = color.ct.argb;
-    return *this;
-}
-#endif
-
 /*! \overload
     Assigns a copy of \a color and returns a reference to this color.
  */
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index f0d7dd23ad..423a0ac50f 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -46,6 +46,8 @@
 #include <QtCore/qstringlist.h>
 #include <QtGui/qrgba64.h>
 
+#include <limits.h>
+
 QT_BEGIN_NAMESPACE
 
 
@@ -87,24 +89,11 @@ public:
     inline QColor(QLatin1String name);
     QColor(Spec spec) noexcept;
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    // ### Qt 6: remove all of these, the trivial ones are fine.
-    Q_DECL_CONSTEXPR QColor(const QColor &color) noexcept
-        : cspec(color.cspec), ct(color.ct)
-    {}
-    Q_DECL_CONSTEXPR QColor(QColor &&other) noexcept : cspec(other.cspec), ct(other.ct) {}
-    QColor &operator=(QColor &&other) noexcept
-    { cspec = other.cspec; ct = other.ct; return *this; }
-    QColor &operator=(const QColor &) noexcept;
-#endif // Qt < 6
-
     QColor &operator=(Qt::GlobalColor color) noexcept;
 
     bool isValid() const noexcept;
 
-    // ### Qt 6: merge overloads
-    QString name() const;
-    QString name(NameFormat format) const;
+    QString name(NameFormat format = HexRgb) const;
 
 #if QT_STRINGVIEW_LEVEL < 2
     void setNamedColor(const QString& name);
@@ -180,11 +169,9 @@ public:
     qreal yellowF() const noexcept;
     qreal blackF() const noexcept;
 
-    void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); // ### Qt 6: remove
     void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr) const;
     void setCmyk(int c, int m, int y, int k, int a = 255);
 
-    void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr); // ### Qt 6: remove
     void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr) const;
     void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
 
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
index 14d7047bb6..a175b591dd 100644
--- a/src/gui/painting/qdrawhelper_ssse3.cpp
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -197,7 +197,7 @@ void qt_memfill24_ssse3(quint24 *dest, quint24 color, qsizetype count)
     quint24 *end = dest + count;
 
     constexpr uchar x = 2, y = 1, z = 0;
-    Q_DECL_ALIGN(__m128i) static const uchar
+    alignas(__m128i) static const uchar
     shuffleMask[16 + 1] = { x, y, z, x,  y, z, x, y,  z, x, y, z,  x, y, z, x,  y };
 
     __m128i mval1 = _mm_shuffle_epi8(m, _mm_load_si128(reinterpret_cast<const __m128i *>(shuffleMask)));