diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2022-11-22 14:10:45 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2022-11-25 00:29:54 +0000 |
| commit | fb35c54b1e8e02329a40e7a5c473bde56038206c (patch) | |
| tree | a348adec79e83f0514483e9f72eecb0eeca99591 /src/gui | |
| parent | f7089e691e2f154f5ce6b50c5fee3d52e693c0ff (diff) | |
Finish the undeprecation of the QColor(string) constructors
Fixes: QTBUG-108743
Pick-to: 6.4
Change-Id: I826ae98a542516a5cf9a4e556d5e8830f9c47a86
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qcolor.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 420e44b086..2d6db1a14c 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -270,7 +270,6 @@ public: // can't give friendship to a namespace, so it needs to be public }; Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE); -#if QT_DEPRECATED_SINCE(6, 6) inline QColor::QColor(QLatin1StringView aname) : QColor(fromString(aname)) {} @@ -282,7 +281,6 @@ inline QColor::QColor(const QString& aname) inline QColor::QColor(const char *aname) : QColor(fromString(aname)) {} -#endif inline bool QColor::isValid() const noexcept { return cspec != Invalid; } |