2 files changed, 78 insertions, 10 deletions

diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 9c32aff330..653e56a3c8 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -829,6 +829,8 @@ QColor::QColor(Spec spec) noexcept
 /*!
     \fn QColor::QColor(const QString &name)
 
+    \obsolete
+
     Constructs a named color in the same way as setNamedColor() using
     the given \a name.
 
@@ -840,6 +842,8 @@ QColor::QColor(Spec spec) noexcept
 /*!
     \fn QColor::QColor(const char *name)
 
+    \obsolete
+
     Constructs a named color in the same way as setNamedColor() using
     the given \a name.
 
@@ -850,6 +854,8 @@ QColor::QColor(Spec spec) noexcept
 /*!
     \fn QColor::QColor(QLatin1String name)
 
+    \obsolete
+
     Constructs a named color in the same way as setNamedColor() using
     the given \a name.
 
@@ -885,6 +891,8 @@ QString QColor::name(NameFormat format) const
 }
 
 /*!
+    \obsolete
+
     Sets the RGB value of this QColor to \a name, which may be in one
     of these formats:
 
@@ -910,32 +918,36 @@ QString QColor::name(NameFormat format) const
 
 void QColor::setNamedColor(const QString &name)
 {
-    setColorFromString(qToStringViewIgnoringNull(name));
+    *this = fromString(qToAnyStringViewIgnoringNull(name));
 }
 
 /*!
     \overload
     \since 5.10
+    \obsolete
 */
 
 void QColor::setNamedColor(QStringView name)
 {
-    setColorFromString(name);
+    *this = fromString(name);
 }
 
 /*!
     \overload
     \since 5.8
+    \obsolete
 */
 
 void QColor::setNamedColor(QLatin1String name)
 {
-    setColorFromString(name);
+    *this = fromString(name);
 }
 
 /*!
    \since 4.7
 
+   \obsolete
+
    Returns \c true if the \a name is a valid color name and can
    be used to construct a valid QColor object, otherwise returns
    false.
@@ -946,27 +958,77 @@ void QColor::setNamedColor(QLatin1String name)
 */
 bool QColor::isValidColor(const QString &name)
 {
-    return isValidColor(qToStringViewIgnoringNull(name));
+    return isValidColorName(qToAnyStringViewIgnoringNull(name));
 }
 
 /*!
     \overload
     \since 5.10
+    \obsolete
 */
 bool QColor::isValidColor(QStringView name) noexcept
 {
-    return name.size() && QColor().setColorFromString(name);
+    return isValidColorName(name);
 }
 
 /*!
     \overload
     \since 5.8
+    \obsolete
 */
 bool QColor::isValidColor(QLatin1String name) noexcept
 {
+    return isValidColorName(name);
+}
+
+/*!
+   \since 6.4
+
+   Returns \c true if the \a name is a valid color name and can
+   be used to construct a valid QColor object, otherwise returns
+   false.
+
+   It uses the same algorithm used in fromString().
+
+   \sa fromString()
+*/
+bool QColor::isValidColorName(QAnyStringView name) noexcept
+{
     return name.size() && QColor().setColorFromString(name);
 }
 
+/*!
+    \since 6.4
+
+    Returns an RGB QColor parsed from \a name, which may be in one
+    of these formats:
+
+    \list
+    \li #RGB (each of R, G, and B is a single hex digit)
+    \li #RRGGBB
+    \li #AARRGGBB (Since 5.2)
+    \li #RRRGGGBBB
+    \li #RRRRGGGGBBBB
+    \li A name from the list of colors defined in the list of
+       \l{https://www.w3.org/TR/SVG11/types.html#ColorKeywords}{SVG color keyword names}
+       provided by the World Wide Web Consortium; for example, "steelblue" or "gainsboro".
+       These color names work on all platforms. Note that these color names are \e not the
+       same as defined by the Qt::GlobalColor enums, e.g. "green" and Qt::green does not
+       refer to the same color.
+    \li \c transparent - representing the absence of a color.
+    \endlist
+
+    Returns an invalid color if \a name cannot be parsed.
+
+    \sa isValidColorName()
+*/
+QColor QColor::fromString(QAnyStringView name) noexcept
+{
+    QColor c;
+    c.setColorFromString(name);
+    return c;
+}
+
 bool QColor::setColorFromString(QAnyStringView name) noexcept
 {
     if (!name.size()) {
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 5898f79f24..a2ff932460 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -85,10 +85,12 @@ public:
     QColor(QRgba64 rgba64) noexcept;
     inline QColor(const QString& name);
     explicit inline QColor(QStringView name);
-    inline QColor(const char *aname) : QColor(QLatin1String(aname)) {}
+    inline QColor(const char *aname);
     inline QColor(QLatin1String name);
     QColor(Spec spec) noexcept;
 
+    static QColor fromString(QAnyStringView name) noexcept;
+
     QColor &operator=(Qt::GlobalColor color) noexcept;
 
     bool isValid() const noexcept;
@@ -224,6 +226,7 @@ public:
     static bool isValidColor(const QString &name);
     static bool isValidColor(QStringView) noexcept;
     static bool isValidColor(QLatin1String) noexcept;
+    static bool isValidColorName(QAnyStringView) noexcept;
 
 private:
 
@@ -295,13 +298,16 @@ public: // can't give friendship to a namespace, so it needs to be public
 Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE);
 
 inline QColor::QColor(QLatin1String aname)
-{ setNamedColor(aname); }
+    : QColor(fromString(aname)) {}
 
 inline QColor::QColor(QStringView aname)
-{ setNamedColor(aname); }
+    : QColor(fromString(aname)) {}
 
 inline QColor::QColor(const QString& aname)
-{ setNamedColor(aname); }
+    : QColor(fromString(aname)) {}
+
+inline QColor::QColor(const char *aname)
+    : QColor(fromString(aname)) {}
 
 inline bool QColor::isValid() const noexcept
 { return cspec != Invalid; }