diff options
authorThorbjørn Lund Martsum <>2012-01-07 08:23:17 +0100
committerQt by Nokia <>2012-01-21 14:29:49 +0100
commit5ff1a76a530cd92b51ca33d42dcbd4c3238b178a (patch)
parent4ed85ba43fa50adacc4e47da6b5e70bad6f03d2e (diff)
Change QMessageBox::question to default to yes/no buttons instead of ok
Beside that it also removes a suggestion about making Ok==Yes and No==Cancel. It would be a problem since we (at least) can have messageboxes with both yes, no and cancel. Change-Id: I567979b2e697e7103968d6512fe4835f86888ca3 Reviewed-by: Robin Burchell <>
2 files changed, 8 insertions, 3 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 1ec68fcb0d..96104d9f04 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -364,3 +364,10 @@ Qt for Windows CE
construction would not be affected by the QPointer, but now that QPointer
is implemented using QWeakPoiner, constructing the QSharedPointer will
cause an abort().
+- QMessageBox
+ * The static function QMessageBox::question has changed the default argument
+ for buttons. Before the default was to have an Ok button. That is changed
+ to having a yes and a no button.
diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h
index 4774389a69..c157a9b388 100644
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@@ -191,10 +191,8 @@ public:
static StandardButton information(QWidget *parent, const QString &title,
const QString &text, StandardButtons buttons = Ok,
StandardButton defaultButton = NoButton);
- // ### Qt 5: Replace Ok with Yes|No in question() function.
- // Also consider if Ok == Yes and Cancel == No.
static StandardButton question(QWidget *parent, const QString &title,
- const QString &text, StandardButtons buttons = Ok,
+ const QString &text, StandardButtons buttons = StandardButtons(Yes | No),
StandardButton defaultButton = NoButton);
static StandardButton warning(QWidget *parent, const QString &title,
const QString &text, StandardButtons buttons = Ok,