From ee18d6ea1f3c2f5388abea58bbe3f1f1ff2b2d5c Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 6 Dec 2011 11:41:02 +0100 Subject: Merge QColorDialog::getColor() overloads. Symbian-specific code was removed as a side effect of the merge. Change-Id: I01d28b2aa2fef16ce3988382c2b2a0436c46227c Reviewed-by: John Brooks Reviewed-by: Frederik Gladhorn --- src/widgets/dialogs/qcolordialog.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/dialogs/qcolordialog.h') diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index fa217c76bf..1d21c06f99 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -95,10 +95,10 @@ public: void setVisible(bool visible); - // ### Qt 5: merge overloads with title = QString() - static QColor getColor(const QColor &initial, QWidget *parent, const QString &title, + static QColor getColor(const QColor &initial = Qt::white, + QWidget *parent = 0, + const QString &title = QString(), ColorDialogOptions options = 0); - static QColor getColor(const QColor &initial = Qt::white, QWidget *parent = 0); // obsolete static QRgb getRgba(QRgb rgba = 0xffffffff, bool *ok = 0, QWidget *parent = 0); -- cgit v1.2.3