whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QColorDialog: deprecate rgba() 

It was already deprecated in the documentation, just use
the QT_DEPRECATED macros.

Change-Id: Ie9ba7dd36af8e4eb5bddb7429182db98c7c638f5
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
bb10
Giuseppe D'Angelo 2018-04-16 15:31:20 +02:00 committed by Christian Ehrlicher
parent b3ebe8713b
commit fcc94b1442
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qcolordialog.cpp
View File

@ -2160,6 +2160,7 @@ QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QStr
return dlg.selectedColor();
}
#if QT_DEPRECATED_SINCE(5, 12)
/*!
\obsolete
@ -2185,6 +2186,7 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent)
*ok = color.isValid();
return result;
}
#endif
/*!
Destroys the color dialog.

5
src/widgets/dialogs/qcolordialog.h
View File

@ -92,8 +92,9 @@ public:
const QString &title = QString(),
ColorDialogOptions options = ColorDialogOptions());
// obsolete
static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = nullptr, QWidget *parent = nullptr);
#if QT_DEPRECATED_SINCE(5, 12)
QT_DEPRECATED_X("Use getColor()") static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = nullptr, QWidget *parent = nullptr);
#endif
static int customCount();
static QColor customColor(int index);