From fcc94b1442ce910231a4267bd56822d616984683 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 16 Apr 2018 15:31:20 +0200 Subject: [PATCH] QColorDialog: deprecate rgba() It was already deprecated in the documentation, just use the QT_DEPRECATED macros. Change-Id: Ie9ba7dd36af8e4eb5bddb7429182db98c7c638f5 Reviewed-by: Christian Ehrlicher Reviewed-by: Richard Moe Gustavsen --- src/widgets/dialogs/qcolordialog.cpp | 2 ++ src/widgets/dialogs/qcolordialog.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index cf1119254b..fdbcdd12e9 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -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. diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 6451ff9bde..cdbe0e7fb4 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -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);