1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish the undeprecation of the QColor(string) constructors

Browse Source 
Fixes: QTBUG-108743
Change-Id: I826ae98a542516a5cf9a4e556d5e8830f9c47a86
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fb35c54b1e8e02329a40e7a5c473bde56038206c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eirik Aavitsland 2022-11-22 14:10:45 +01:00 committed by Qt Cherry-pick Bot
parent ff52558530
commit a5be86897f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qcolor.h
View File

@ -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); Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE);
#if QT_DEPRECATED_SINCE(6, 6)
inline QColor::QColor(QLatin1StringView aname) inline QColor::QColor(QLatin1StringView aname)
: QColor(fromString(aname)) {} : QColor(fromString(aname)) {}
@ -282,7 +281,6 @@ inline QColor::QColor(const QString& aname)
inline QColor::QColor(const char *aname) inline QColor::QColor(const char *aname)
: QColor(fromString(aname)) {} : QColor(fromString(aname)) {}
#endif
inline bool QColor::isValid() const noexcept inline bool QColor::isValid() const noexcept
{ return cspec != Invalid; } { return cspec != Invalid; }